From 9357456e6a7e7cbf7c4889fafc81af59939460f6 Mon Sep 17 00:00:00 2001 From: TacoTheDank Date: Fri, 26 Jun 2020 23:29:14 -0400 Subject: [PATCH 01/29] Fix some deprecations --- .../fragment/FileSelectorDialogFragment.java | 13 ++-- .../fragment/KeyboardShortcutsFragment.java | 2 +- .../preference/MultiSelectListPreference.java | 2 +- .../NotificationTypePreference.java | 2 +- .../preference/SeekBarDialogPreference.java | 2 +- .../SettingsImportExportPreference.java | 2 +- .../preference/ThemeBackgroundPreference.java | 2 +- .../SupportFragmentReloadCursorObserver.java | 63 ------------------- .../twidere/util/support/ActivitySupport.java | 2 +- 9 files changed, 14 insertions(+), 76 deletions(-) delete mode 100644 twidere/src/main/java/org/mariotaku/twidere/util/content/SupportFragmentReloadCursorObserver.java diff --git a/twidere/src/main/java/org/mariotaku/twidere/fragment/FileSelectorDialogFragment.java b/twidere/src/main/java/org/mariotaku/twidere/fragment/FileSelectorDialogFragment.java index b3848a953..6ff9c4c52 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/fragment/FileSelectorDialogFragment.java +++ b/twidere/src/main/java/org/mariotaku/twidere/fragment/FileSelectorDialogFragment.java @@ -1,18 +1,18 @@ /* * Twidere - Twitter client for Android - * + * * Copyright (C) 2012-2014 Mariotaku Lee - * + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -30,6 +30,7 @@ import android.os.Bundle; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.fragment.app.FragmentActivity; +import androidx.loader.app.LoaderManager; import androidx.loader.app.LoaderManager.LoaderCallbacks; import androidx.loader.content.FixedAsyncTaskLoader; import androidx.loader.content.Loader; @@ -73,7 +74,7 @@ public class FileSelectorDialogFragment extends BaseDialogFragment implements Lo public void onActivityCreated(final Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); final Bundle args = getArguments(); - getLoaderManager().initLoader(0, args, this); + LoaderManager.getInstance(this).initLoader(0, args, this); } @Override @@ -155,7 +156,7 @@ public class FileSelectorDialogFragment extends BaseDialogFragment implements Lo if (file.isDirectory()) { final Bundle args = getArguments(); args.putString(EXTRA_PATH, file.getAbsolutePath()); - getLoaderManager().restartLoader(0, args, this); + LoaderManager.getInstance(this).restartLoader(0, args, this); } else if (file.isFile() && !isPickDirectory()) { final FragmentActivity a = getActivity(); if (a instanceof Callback) { diff --git a/twidere/src/main/java/org/mariotaku/twidere/fragment/KeyboardShortcutsFragment.java b/twidere/src/main/java/org/mariotaku/twidere/fragment/KeyboardShortcutsFragment.java index 866fc293e..cfe5d7e4c 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/fragment/KeyboardShortcutsFragment.java +++ b/twidere/src/main/java/org/mariotaku/twidere/fragment/KeyboardShortcutsFragment.java @@ -67,7 +67,7 @@ public class KeyboardShortcutsFragment extends BasePreferenceFragment implements public boolean onOptionsItemSelected(MenuItem item) { if (item.getItemId() == R.id.reset) { final DialogFragment f = new ResetKeyboardShortcutConfirmDialogFragment(); - f.show(getFragmentManager(), "reset_keyboard_shortcut_confirm"); + f.show(getParentFragmentManager(), "reset_keyboard_shortcut_confirm"); return true; } return super.onOptionsItemSelected(item); diff --git a/twidere/src/main/java/org/mariotaku/twidere/preference/MultiSelectListPreference.java b/twidere/src/main/java/org/mariotaku/twidere/preference/MultiSelectListPreference.java index b4e77996b..0f7536db5 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/preference/MultiSelectListPreference.java +++ b/twidere/src/main/java/org/mariotaku/twidere/preference/MultiSelectListPreference.java @@ -56,7 +56,7 @@ abstract class MultiSelectListPreference extends DialogPreference implements IDi public void displayDialog(@NonNull PreferenceFragmentCompat fragment) { final MultiSelectListDialogFragment df = MultiSelectListDialogFragment.newInstance(getKey()); df.setTargetFragment(fragment, 0); - df.show(fragment.getFragmentManager(), getKey()); + df.show(fragment.getParentFragmentManager(), getKey()); } protected abstract boolean[] getDefaults(); diff --git a/twidere/src/main/java/org/mariotaku/twidere/preference/NotificationTypePreference.java b/twidere/src/main/java/org/mariotaku/twidere/preference/NotificationTypePreference.java index bce4dc78b..fa64c5871 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/preference/NotificationTypePreference.java +++ b/twidere/src/main/java/org/mariotaku/twidere/preference/NotificationTypePreference.java @@ -98,7 +98,7 @@ public class NotificationTypePreference extends DialogPreference implements public void displayDialog(@NonNull PreferenceFragmentCompat fragment) { final NotificationTypeDialogFragment df = NotificationTypeDialogFragment.newInstance(getKey()); df.setTargetFragment(fragment, 0); - df.show(fragment.getFragmentManager(), getKey()); + df.show(fragment.getParentFragmentManager(), getKey()); } public int getDefaultValue() { diff --git a/twidere/src/main/java/org/mariotaku/twidere/preference/SeekBarDialogPreference.java b/twidere/src/main/java/org/mariotaku/twidere/preference/SeekBarDialogPreference.java index d8ae0d29b..e4d162e86 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/preference/SeekBarDialogPreference.java +++ b/twidere/src/main/java/org/mariotaku/twidere/preference/SeekBarDialogPreference.java @@ -188,7 +188,7 @@ public class SeekBarDialogPreference extends DialogPreference implements IDialog public void displayDialog(@NonNull PreferenceFragmentCompat fragment) { SeekBarDialogPreferenceFragment df = SeekBarDialogPreferenceFragment.newInstance(getKey()); df.setTargetFragment(fragment, 0); - df.show(fragment.getFragmentManager(), getKey()); + df.show(fragment.getParentFragmentManager(), getKey()); } public static class SeekBarDialogPreferenceFragment extends ThemedPreferenceDialogFragmentCompat { diff --git a/twidere/src/main/java/org/mariotaku/twidere/preference/SettingsImportExportPreference.java b/twidere/src/main/java/org/mariotaku/twidere/preference/SettingsImportExportPreference.java index 7d520e36c..fd06f58d3 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/preference/SettingsImportExportPreference.java +++ b/twidere/src/main/java/org/mariotaku/twidere/preference/SettingsImportExportPreference.java @@ -52,7 +52,7 @@ public class SettingsImportExportPreference extends DialogPreference implements public void displayDialog(@NonNull PreferenceFragmentCompat fragment) { ImportExportDialogFragment df = ImportExportDialogFragment.newInstance(getKey()); df.setTargetFragment(fragment, 0); - df.show(fragment.getFragmentManager(), getKey()); + df.show(fragment.getParentFragmentManager(), getKey()); } public static class ImportExportDialogFragment extends PreferenceDialogFragmentCompat { diff --git a/twidere/src/main/java/org/mariotaku/twidere/preference/ThemeBackgroundPreference.java b/twidere/src/main/java/org/mariotaku/twidere/preference/ThemeBackgroundPreference.java index ad66c6aef..6798d46a6 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/preference/ThemeBackgroundPreference.java +++ b/twidere/src/main/java/org/mariotaku/twidere/preference/ThemeBackgroundPreference.java @@ -98,7 +98,7 @@ public class ThemeBackgroundPreference extends DialogPreference implements Const public void displayDialog(@NonNull PreferenceFragmentCompat fragment) { InternalDialogFragment df = InternalDialogFragment.newInstance(getKey()); df.setTargetFragment(fragment, 0); - df.show(fragment.getFragmentManager(), getKey()); + df.show(fragment.getParentFragmentManager(), getKey()); } private void saveValue() { diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/content/SupportFragmentReloadCursorObserver.java b/twidere/src/main/java/org/mariotaku/twidere/util/content/SupportFragmentReloadCursorObserver.java deleted file mode 100644 index 9f2633790..000000000 --- a/twidere/src/main/java/org/mariotaku/twidere/util/content/SupportFragmentReloadCursorObserver.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Twidere - Twitter client for Android - * - * Copyright (C) 2012-2014 Mariotaku Lee - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package org.mariotaku.twidere.util.content; - -import android.database.ContentObserver; -import android.database.Cursor; -import android.net.Uri; -import android.os.Handler; -import android.os.Looper; -import androidx.annotation.Nullable; -import androidx.fragment.app.Fragment; -import androidx.loader.app.LoaderManager.LoaderCallbacks; - -import org.mariotaku.twidere.TwidereConstants; - -public class SupportFragmentReloadCursorObserver extends ContentObserver implements TwidereConstants { - - private final Fragment mFragment; - private final int mLoaderId; - private final LoaderCallbacks mCallback; - - public SupportFragmentReloadCursorObserver(final Fragment fragment, final int loaderId, - final LoaderCallbacks callback) { - super(createHandler()); - mFragment = fragment; - mLoaderId = loaderId; - mCallback = callback; - } - - private static Handler createHandler() { - if (Thread.currentThread().getId() != 1) return new Handler(Looper.getMainLooper()); - return new Handler(); - } - - @Override - public final void onChange(final boolean selfChange) { - onChange(selfChange, null); - } - - @Override - public void onChange(final boolean selfChange, @Nullable final Uri uri) { - if (mFragment == null || mFragment.getActivity() == null || mFragment.isDetached()) return; - // Handle change. - mFragment.getLoaderManager().restartLoader(mLoaderId, null, mCallback); - } -} diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/support/ActivitySupport.java b/twidere/src/main/java/org/mariotaku/twidere/util/support/ActivitySupport.java index b61f47c19..860eb13ff 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/util/support/ActivitySupport.java +++ b/twidere/src/main/java/org/mariotaku/twidere/util/support/ActivitySupport.java @@ -45,7 +45,7 @@ public class ActivitySupport { } private static TaskDescription toNativeTaskDescription(TaskDescriptionCompat taskDescription) { - return new TaskDescription(taskDescription.getLabel(), taskDescription.getIcon(), taskDescription.getPrimaryColor()); + return new TaskDescription(taskDescription.getLabel(), taskDescription.getPrimaryColor()); } } From b5d735086a84778685e29e3f7a0684631928383d Mon Sep 17 00:00:00 2001 From: TacoTheDank Date: Sat, 27 Jun 2020 16:39:31 -0400 Subject: [PATCH 02/29] Update a few libraries --- build.gradle | 2 +- twidere.component.common/build.gradle | 1 - twidere.component.nyan/build.gradle | 2 +- twidere/build.gradle | 15 ++++++++------- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index a539ea043..60733681d 100644 --- a/build.gradle +++ b/build.gradle @@ -43,7 +43,7 @@ subprojects { Kotlin : "${kotlinVersion}", LoganSquare : '1.3.7', - Jackson : '2.7.4', + Jackson : '2.11.1', ParcelablePlease : '1.0.2', ExportablePreferences: '0.9.7', diff --git a/twidere.component.common/build.gradle b/twidere.component.common/build.gradle index 0a025df0e..c91bf3618 100644 --- a/twidere.component.common/build.gradle +++ b/twidere.component.common/build.gradle @@ -95,7 +95,6 @@ dependencies { annotationProcessor "com.github.mariotaku.ObjectCursor:processor:${sharedVersions['ObjectCursor']}" implementation "com.github.mariotaku.RestFu:library:${sharedVersions['RestFu']}" implementation "com.github.mariotaku.RestFu:oauth:${sharedVersions['RestFu']}" - implementation "com.github.mariotaku.RestFu:oauth2:${sharedVersions['RestFu']}" } install { diff --git a/twidere.component.nyan/build.gradle b/twidere.component.nyan/build.gradle index afe678fbf..13f584512 100644 --- a/twidere.component.nyan/build.gradle +++ b/twidere.component.nyan/build.gradle @@ -38,5 +38,5 @@ android { } dependencies { - implementation 'androidx.core:core:1.2.0' + implementation 'androidx.core:core:1.3.0' } diff --git a/twidere/build.gradle b/twidere/build.gradle index 9b1c20ebb..e1f01ddd8 100644 --- a/twidere/build.gradle +++ b/twidere/build.gradle @@ -175,8 +175,8 @@ ext { libVersions = [ Kovenant : '3.3.0', Mime4J : '0.7.2', - Dagger : '2.28', - Exoplayer : '2.11.5', + Dagger : '2.28.1', + Exoplayer : '2.11.6', Glide : '4.11.0', MediaViewerLibrary: '0.9.23', PlayServices : '17.0.0', @@ -189,7 +189,7 @@ dependencies { implementation project(':twidere.component.nyan') /** Kotlin **/ - implementation "org.jetbrains.kotlin:kotlin-stdlib:${sharedVersions['Kotlin']}" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${sharedVersions['Kotlin']}" implementation "nl.komponents.kovenant:kovenant:${libVersions['Kovenant']}" implementation "nl.komponents.kovenant:kovenant-android:${libVersions['Kovenant']}" implementation "nl.komponents.kovenant:kovenant-combine:${libVersions['Kovenant']}" @@ -201,14 +201,15 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.3.0-alpha01' implementation 'androidx.browser:browser:1.2.0' implementation 'androidx.cardview:cardview:1.0.0' - implementation 'androidx.core:core:1.2.0' - implementation 'androidx.core:core-ktx:1.2.0' + implementation 'androidx.core:core:1.3.0' + implementation 'androidx.core:core-ktx:1.3.0' implementation 'androidx.drawerlayout:drawerlayout:1.1.0-alpha01' implementation 'androidx.exifinterface:exifinterface:1.2.0' implementation 'androidx.legacy:legacy-support-core-ui:1.0.0' implementation 'androidx.multidex:multidex:2.0.1' implementation 'androidx.palette:palette-ktx:1.0.0' implementation 'androidx.preference:preference:1.1.1' + implementation 'androidx.preference:preference-ktx:1.1.1' implementation 'androidx.recyclerview:recyclerview:1.1.0' implementation 'com.google.android.material:material:1.1.0' @@ -218,7 +219,7 @@ dependencies { implementation 'com.twitter:twitter-text:1.14.7' implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.6.0' implementation 'com.squareup:otto:1.3.8' - implementation 'dnsjava:dnsjava:2.1.9' + implementation 'dnsjava:dnsjava:3.2.1' implementation 'com.commonsware.cwac:layouts:0.4.5' implementation 'com.rengwuxian.materialedittext:library:2.1.4' implementation 'com.pnikosis:materialish-progress:1.7' @@ -314,7 +315,7 @@ dependencies { /** Testing **/ - testImplementation 'junit:junit:4.12' + testImplementation 'junit:junit:4.13' androidTestImplementation 'androidx.annotation:annotation:1.1.0' androidTestImplementation 'androidx.test.ext:junit:1.1.1' androidTestImplementation 'androidx.test:rules:1.2.0' From d3bd4c4dabb9d7469a591b9f1ef2fd2c4449432e Mon Sep 17 00:00:00 2001 From: TacoTheDank Date: Sat, 27 Jun 2020 16:43:38 -0400 Subject: [PATCH 03/29] Update twitter-text library --- twidere/build.gradle | 2 +- .../extension/text/twitter/ExtractorExtensionsTest.kt | 2 +- .../java/org/mariotaku/twidere/util/TwidereLinkify.java | 6 +++--- .../org/mariotaku/twidere/activity/ComposeActivity.kt | 2 +- .../kotlin/org/mariotaku/twidere/alias/TwitterAliases.kt | 4 +++- .../twidere/extension/text/twitter/ExtractorExtensions.kt | 2 +- .../twidere/extension/text/twitter/ValidatorExtensions.kt | 4 ++-- .../twidere/fragment/AddStatusFilterDialogFragment.kt | 2 +- .../mariotaku/twidere/fragment/UserProfileEditorFragment.kt | 2 +- .../org/mariotaku/twidere/service/BaseIntentService.kt | 2 +- .../kotlin/org/mariotaku/twidere/service/BaseService.kt | 2 +- .../kotlin/org/mariotaku/twidere/task/BaseAbstractTask.kt | 2 +- .../org/mariotaku/twidere/util/MultiSelectEventHandler.kt | 2 +- .../twidere/util/TwitterValidatorMETLengthChecker.kt | 2 +- .../org/mariotaku/twidere/util/dagger/ApplicationModule.kt | 2 +- .../org/mariotaku/twidere/util/text/TwitterValidator.kt | 4 ++-- 16 files changed, 22 insertions(+), 20 deletions(-) diff --git a/twidere/build.gradle b/twidere/build.gradle index e1f01ddd8..7a6274786 100644 --- a/twidere/build.gradle +++ b/twidere/build.gradle @@ -216,7 +216,7 @@ dependencies { /** Third-party dependencies **/ compileOnly 'javax.annotation:jsr250-api:1.0' - implementation 'com.twitter:twitter-text:1.14.7' + implementation 'com.twitter.twittertext:twitter-text:3.1.0' implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.6.0' implementation 'com.squareup:otto:1.3.8' implementation 'dnsjava:dnsjava:3.2.1' diff --git a/twidere/src/androidTest/kotlin/org/mariotaku/twidere/extension/text/twitter/ExtractorExtensionsTest.kt b/twidere/src/androidTest/kotlin/org/mariotaku/twidere/extension/text/twitter/ExtractorExtensionsTest.kt index 0a6e75f7b..3dd7855f3 100644 --- a/twidere/src/androidTest/kotlin/org/mariotaku/twidere/extension/text/twitter/ExtractorExtensionsTest.kt +++ b/twidere/src/androidTest/kotlin/org/mariotaku/twidere/extension/text/twitter/ExtractorExtensionsTest.kt @@ -21,7 +21,7 @@ package org.mariotaku.twidere.extension.text.twitter import androidx.test.platform.app.InstrumentationRegistry import androidx.test.ext.junit.runners.AndroidJUnit4 -import com.twitter.Extractor +import com.twitter.twittertext.Extractor import org.junit.Assert import org.junit.Before import org.junit.Test diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/TwidereLinkify.java b/twidere/src/main/java/org/mariotaku/twidere/util/TwidereLinkify.java index 5ca16df63..28bca4056 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/util/TwidereLinkify.java +++ b/twidere/src/main/java/org/mariotaku/twidere/util/TwidereLinkify.java @@ -26,9 +26,9 @@ import android.text.Spannable; import android.text.Spanned; import android.text.style.URLSpan; -import com.twitter.Extractor; -import com.twitter.Extractor.Entity; -import com.twitter.Regex; +import com.twitter.twittertext.Extractor; +import com.twitter.twittertext.Extractor.Entity; +import com.twitter.twittertext.Regex; import org.mariotaku.twidere.Constants; import org.mariotaku.twidere.model.UserKey; 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 2ab75e095..acab99bcb 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/ComposeActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/ComposeActivity.kt @@ -56,7 +56,7 @@ import android.view.animation.DecelerateInterpolator import android.widget.ImageView import android.widget.Toast import com.bumptech.glide.Glide -import com.twitter.Extractor +import com.twitter.twittertext.Extractor import kotlinx.android.synthetic.main.activity_compose.* import nl.komponents.kovenant.task import org.mariotaku.abstask.library.AbstractTask diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/alias/TwitterAliases.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/alias/TwitterAliases.kt index d14098ebf..db4eb8664 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/alias/TwitterAliases.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/alias/TwitterAliases.kt @@ -19,4 +19,6 @@ package org.mariotaku.twidere.alias -typealias TwitterRegex = com.twitter.Regex +import com.twitter.twittertext.Regex + +typealias TwitterRegex = Regex diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/text/twitter/ExtractorExtensions.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/text/twitter/ExtractorExtensions.kt index 47c1420d2..e24752a5b 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/text/twitter/ExtractorExtensions.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/text/twitter/ExtractorExtensions.kt @@ -19,7 +19,7 @@ package org.mariotaku.twidere.extension.text.twitter -import com.twitter.Extractor +import com.twitter.twittertext.Extractor import org.mariotaku.twidere.extension.model.replyMentions import org.mariotaku.twidere.model.ParcelableStatus import org.mariotaku.twidere.model.ParcelableUserMention diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/text/twitter/ValidatorExtensions.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/text/twitter/ValidatorExtensions.kt index 90aa1638b..efdb2c9a1 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/text/twitter/ValidatorExtensions.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/text/twitter/ValidatorExtensions.kt @@ -19,8 +19,8 @@ package org.mariotaku.twidere.extension.text.twitter -import com.twitter.Extractor -import com.twitter.Validator +import com.twitter.twittertext.Extractor +import com.twitter.twittertext.Validator import org.mariotaku.twidere.model.ParcelableStatus import org.mariotaku.twidere.model.UserKey diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AddStatusFilterDialogFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AddStatusFilterDialogFragment.kt index f99151154..3e551c3d1 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AddStatusFilterDialogFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AddStatusFilterDialogFragment.kt @@ -24,7 +24,7 @@ import android.content.ContentValues import android.os.Bundle import androidx.fragment.app.FragmentManager import androidx.appcompat.app.AlertDialog -import com.twitter.Extractor +import com.twitter.twittertext.Extractor import org.mariotaku.kpreferences.get import org.mariotaku.twidere.R import org.mariotaku.twidere.constant.IntentConstants.EXTRA_STATUS 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 10f73a78c..8aa3ea90c 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserProfileEditorFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserProfileEditorFragment.kt @@ -33,7 +33,7 @@ import android.text.TextUtils.isEmpty import android.view.* import android.view.View.OnClickListener import android.widget.Toast -import com.twitter.Validator +import com.twitter.twittertext.Validator import kotlinx.android.synthetic.main.fragment_user_profile_editor.* import nl.komponents.kovenant.combine.and import nl.komponents.kovenant.ui.promiseOnUi diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/service/BaseIntentService.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/service/BaseIntentService.kt index e17da56f3..19271bfbb 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/service/BaseIntentService.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/service/BaseIntentService.kt @@ -2,7 +2,7 @@ package org.mariotaku.twidere.service import android.app.IntentService import android.content.SharedPreferences -import com.twitter.Extractor +import com.twitter.twittertext.Extractor import org.mariotaku.twidere.util.AsyncTwitterWrapper import org.mariotaku.twidere.util.NotificationManagerWrapper import org.mariotaku.twidere.util.UserColorNameManager diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/service/BaseService.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/service/BaseService.kt index 7ff5b119b..91c33176d 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/service/BaseService.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/service/BaseService.kt @@ -22,7 +22,7 @@ package org.mariotaku.twidere.service import android.app.Service import android.content.SharedPreferences import android.net.ConnectivityManager -import com.twitter.Extractor +import com.twitter.twittertext.Extractor import org.mariotaku.twidere.util.* import org.mariotaku.twidere.util.dagger.GeneralComponent import org.mariotaku.twidere.util.notification.ContentNotificationManager diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/task/BaseAbstractTask.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/task/BaseAbstractTask.kt index 3a9a8b1f6..b9a7838cb 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/task/BaseAbstractTask.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/task/BaseAbstractTask.kt @@ -3,7 +3,7 @@ package org.mariotaku.twidere.task import android.content.Context import android.content.SharedPreferences import com.squareup.otto.Bus -import com.twitter.Extractor +import com.twitter.twittertext.Extractor import org.mariotaku.abstask.library.AbstractTask import org.mariotaku.kpreferences.KPreferences import org.mariotaku.restfu.http.RestHttpClient diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/MultiSelectEventHandler.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/MultiSelectEventHandler.kt index 498475338..bb3568b53 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/MultiSelectEventHandler.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/MultiSelectEventHandler.kt @@ -28,7 +28,7 @@ import android.view.ActionMode import android.view.Menu import android.view.MenuItem import android.widget.Toast -import com.twitter.Extractor +import com.twitter.twittertext.Extractor import org.mariotaku.twidere.R import org.mariotaku.twidere.activity.BaseActivity import org.mariotaku.twidere.constant.IntentConstants.* diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/TwitterValidatorMETLengthChecker.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/TwitterValidatorMETLengthChecker.kt index 7c64fc7c9..ec0111253 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/TwitterValidatorMETLengthChecker.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/TwitterValidatorMETLengthChecker.kt @@ -20,7 +20,7 @@ package org.mariotaku.twidere.util import com.rengwuxian.materialedittext.validation.METLengthChecker -import com.twitter.Validator +import com.twitter.twittertext.Validator /** * Created by mariotaku on 15/4/29. diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/dagger/ApplicationModule.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/dagger/ApplicationModule.kt index 8ff9d59d9..b21422ca1 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/dagger/ApplicationModule.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/dagger/ApplicationModule.kt @@ -33,7 +33,7 @@ import com.google.android.exoplayer2.extractor.ExtractorsFactory import com.google.android.exoplayer2.upstream.DataSource import com.squareup.otto.Bus import com.squareup.otto.ThreadEnforcer -import com.twitter.Extractor +import com.twitter.twittertext.Extractor import dagger.Module import dagger.Provides import okhttp3.Cache diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/text/TwitterValidator.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/text/TwitterValidator.kt index cb1a255b5..6d400b437 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/text/TwitterValidator.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/text/TwitterValidator.kt @@ -19,8 +19,8 @@ package org.mariotaku.twidere.util.text -import com.twitter.Extractor -import com.twitter.Validator +import com.twitter.twittertext.Extractor +import com.twitter.twittertext.Validator import java.text.Normalizer object TwitterValidator : Validator() { From 894a4aa3255b64d5ccf67faeafecc06e20934459 Mon Sep 17 00:00:00 2001 From: TacoTheDank Date: Sat, 27 Jun 2020 16:52:47 -0400 Subject: [PATCH 04/29] Update subsampling-scale-image-view library --- twidere/build.gradle | 2 +- .../org/mariotaku/twidere/fragment/media/ImagePageFragment.kt | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/twidere/build.gradle b/twidere/build.gradle index 7a6274786..b4d61c900 100644 --- a/twidere/build.gradle +++ b/twidere/build.gradle @@ -217,7 +217,7 @@ dependencies { /** Third-party dependencies **/ compileOnly 'javax.annotation:jsr250-api:1.0' implementation 'com.twitter.twittertext:twitter-text:3.1.0' - implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.6.0' + implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.10.0' implementation 'com.squareup:otto:1.3.8' implementation 'dnsjava:dnsjava:3.2.1' implementation 'com.commonsware.cwac:layouts:0.4.5' diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/media/ImagePageFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/media/ImagePageFragment.kt index e2161f094..cfd62e256 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/media/ImagePageFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/media/ImagePageFragment.kt @@ -24,6 +24,7 @@ import android.content.Context import android.graphics.Bitmap import android.graphics.BitmapFactory import android.net.Uri +import android.os.AsyncTask import com.davemorrissey.labs.subscaleview.ImageSource import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView import com.davemorrissey.labs.subscaleview.decoder.SkiaImageDecoder @@ -91,7 +92,7 @@ class ImagePageFragment : SubsampleImageViewerFragment() { override fun setupImageView(imageView: SubsamplingScaleImageView) { imageView.maxScale = resources.displayMetrics.density imageView.setBitmapDecoderClass(PreviewBitmapDecoder::class.java) - imageView.setParallelLoadingEnabled(true) + imageView.setExecutor(AsyncTask.THREAD_POOL_EXECUTOR) imageView.setOnClickListener { val activity = activity as? MediaViewerActivity ?: return@setOnClickListener activity.toggleBar() From 536371eb894193463648be5184ee5eaa1cf5d3bc Mon Sep 17 00:00:00 2001 From: TacoTheDank Date: Sun, 28 Jun 2020 16:49:50 -0400 Subject: [PATCH 05/29] Fix a bunch of deprecations in Kotlin, and a few misc things --- .../activity/QuickSearchBarActivity.kt | 7 ++-- .../twidere/activity/SignInActivity.kt | 8 ++--- .../TrendsLocationSelectorActivity.kt | 18 ++++++++++ .../activity/UserListSelectorActivity.kt | 6 ++-- .../twidere/activity/UserSelectorActivity.kt | 4 +-- .../activity/WebLinkHandlerActivity.kt | 4 +-- .../twidere/adapter/DummyItemAdapter.kt | 2 +- .../adapter/ParcelableActivitiesAdapter.kt | 2 +- .../adapter/ParcelableStatusesAdapter.kt | 2 +- .../model/api/microblog/ActivityExtensions.kt | 16 ++++----- .../fragment/APIEditorDialogFragment.kt | 2 +- .../twidere/fragment/AbsActivitiesFragment.kt | 5 +-- .../fragment/AbsMediaStatusesFragment.kt | 5 +-- .../twidere/fragment/AbsStatusesFragment.kt | 5 +-- .../fragment/AccountsDashboardFragment.kt | 25 +++++++++++-- .../fragment/AccountsManagerFragment.kt | 2 +- .../fragment/CursorActivitiesFragment.kt | 5 +-- .../fragment/CursorStatusesFragment.kt | 3 +- .../twidere/fragment/CustomTabsFragment.kt | 5 +-- .../fragment/EditUserListDialogFragment.kt | 12 +++---- .../fragment/ExtensionsListFragment.kt | 3 +- .../twidere/fragment/GroupFragment.kt | 5 +-- .../fragment/HostMappingsListFragment.kt | 4 +-- .../twidere/fragment/ItemsListFragment.kt | 5 +-- .../fragment/ParcelableGroupsFragment.kt | 7 ++-- .../fragment/ParcelableStatusesFragment.kt | 5 +-- .../fragment/ParcelableUserListsFragment.kt | 9 ++--- .../fragment/ParcelableUsersFragment.kt | 9 ++--- .../fragment/SavedSearchesListFragment.kt | 9 ++--- .../fragment/TrendsSuggestionsFragment.kt | 5 +-- .../twidere/fragment/UserFragment.kt | 17 ++++----- .../twidere/fragment/UserListFragment.kt | 9 ++--- .../fragment/UserListsOwnershipsFragment.kt | 2 +- .../fragment/UserProfileEditorFragment.kt | 3 +- .../twidere/fragment/UserQrDialogFragment.kt | 4 +-- .../fragment/drafts/DraftsListFragment.kt | 3 +- .../fragment/filter/AddEditItemFragment.kt | 2 +- .../fragment/filter/BaseFiltersFragment.kt | 4 +-- .../filter/BaseFiltersImportFragment.kt | 8 ++--- .../filter/FiltersSubscriptionsFragment.kt | 14 ++++---- .../MessageConversationInfoFragment.kt | 23 ++++++------ .../message/MessageNewConversationFragment.kt | 13 +++---- .../message/MessagesConversationFragment.kt | 7 ++-- .../message/MessagesEntriesFragment.kt | 3 +- .../status/AbsStatusDialogFragment.kt | 8 ++--- .../status/BlockStatusUsersDialogFragment.kt | 2 +- .../status/MuteStatusUsersDialogFragment.kt | 2 +- .../twidere/fragment/status/StatusFragment.kt | 19 +++++----- .../TranslationDestinationDialogFragment.kt | 2 +- .../statuses/MediaStatusesSearchFragment.kt | 3 +- .../statuses/UserMediaTimelineFragment.kt | 3 +- .../fragment/statuses/UserTimelineFragment.kt | 2 +- .../fragment/users/UserListMembersFragment.kt | 2 +- .../twidere/loader/ExtensionsListLoader.kt | 35 +++++++++++++++++-- .../twidere/model/ParameterizedExpression.kt | 18 ++++++++++ .../model/util/ParcelableRelationshipUtils.kt | 8 ++--- .../preference/ColorPickerPreference.kt | 2 +- .../preference/DefaultAPIPreference.kt | 2 +- .../preference/KeyboardShortcutPreference.kt | 2 +- .../RandomizeAccountNamePreference.kt | 2 +- .../preference/ThemedEditTextPreference.kt | 2 +- .../preference/ThemedListPreference.kt | 2 +- .../task/twitter/GetActivitiesAboutMeTask.kt | 4 +-- .../twidere/task/twitter/UpdateStatusTask.kt | 26 ++++++++++++-- .../twidere/util/AsyncTwitterWrapper.kt | 4 --- .../mariotaku/twidere/util/DataStoreUtils.kt | 4 +-- .../org/mariotaku/twidere/util/IntentUtils.kt | 2 +- .../twidere/util/gifshare/GifShareProvider.kt | 2 +- .../util/glide/RoundedRectTransformation.kt | 4 +-- .../twidere/util/glide/TwidereGlideModule.kt | 3 +- .../twidere/util/media/MediaPreloader.kt | 4 +-- .../twidere/util/net/SystemDnsFetcher.kt | 4 +-- .../util/schedule/StatusScheduleProvider.kt | 2 +- .../twidere/util/sync/TimelineSyncManager.kt | 2 +- .../twidere/util/text/TwitterValidator.kt | 3 +- .../mariotaku/twidere/view/IconActionView.kt | 6 ++-- .../org/mariotaku/yandex/YandexAPIFactory.kt | 2 +- ...message_conversation_info_button_space.xml | 2 +- 78 files changed, 313 insertions(+), 188 deletions(-) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/QuickSearchBarActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/QuickSearchBarActivity.kt index 91551eb84..4d47640c3 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/QuickSearchBarActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/QuickSearchBarActivity.kt @@ -28,6 +28,7 @@ import android.database.Cursor import android.graphics.PorterDuff.Mode import android.net.Uri import android.os.Bundle +import androidx.loader.app.LoaderManager import androidx.loader.app.LoaderManager.LoaderCallbacks import androidx.loader.content.CursorLoader import androidx.loader.content.Loader @@ -157,7 +158,7 @@ class QuickSearchBarActivity : BaseActivity(), OnClickListener, LoaderCallbacks< searchQuery.setSelection(searchQuery.length()) } - supportLoaderManager.initLoader(0, null, this) + LoaderManager.getInstance(this).initLoader(0, null, this) updateSubmitButton() promotionService.loadBanner(adContainer) @@ -179,7 +180,7 @@ class QuickSearchBarActivity : BaseActivity(), OnClickListener, LoaderCallbacks< adapter.addRemovedPositions(reverseSortedPositions) ContentResolverUtils.bulkDelete(contentResolver, SearchHistory.CONTENT_URI, SearchHistory._ID, false, ids, null, null) - supportLoaderManager.restartLoader(0, null, this) + LoaderManager.getInstance(this).restartLoader(0, null, this) } override fun onClick(v: View) { @@ -298,7 +299,7 @@ class QuickSearchBarActivity : BaseActivity(), OnClickListener, LoaderCallbacks< } override fun onItemSelected(parent: AdapterView<*>, view: View?, position: Int, id: Long) { - supportLoaderManager.restartLoader(0, null, this) + LoaderManager.getInstance(this).restartLoader(0, null, this) } override fun onNothingSelected(parent: AdapterView<*>) { diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/SignInActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/SignInActivity.kt index 3889005f8..45df854f6 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/SignInActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/SignInActivity.kt @@ -583,9 +583,9 @@ class SignInActivity : BaseActivity(), OnClickListener, TextWatcher, val builder = AlertDialog.Builder(requireContext()) builder.setView(R.layout.dialog_expandable_list) val dialog = builder.create() - dialog.onShow { - it.applyTheme() - val listView = it.expandableList + dialog.onShow { alertDialog -> + alertDialog.applyTheme() + val listView = alertDialog.expandableList val adapter = LoginTypeAdapter(requireContext()) listView.setAdapter(adapter) listView.setOnGroupClickListener { _, _, groupPosition, _ -> @@ -613,7 +613,7 @@ class SignInActivity : BaseActivity(), OnClickListener, TextWatcher, return@setOnChildClickListener true } - loaderManager.initLoader(0, null, this) + LoaderManager.getInstance(this).initLoader(0, null, this) } return dialog } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/TrendsLocationSelectorActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/TrendsLocationSelectorActivity.kt index 9ab2c7d63..0ef1493b5 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/TrendsLocationSelectorActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/TrendsLocationSelectorActivity.kt @@ -275,6 +275,24 @@ class TrendsLocationSelectorActivity : BaseActivity() { dest.writeTypedArray(children, flags) } + override fun equals(other: Any?): Boolean { + if (this === other) return true + if (javaClass != other?.javaClass) return false + + other as LocationsData + + if (root != other.root) return false + if (!children.contentEquals(other.children)) return false + + return true + } + + override fun hashCode(): Int { + var result = root.hashCode() + result = 31 * result + children.contentHashCode() + return result + } + companion object { @JvmField val CREATOR = object : Parcelable.Creator { diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/UserListSelectorActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/UserListSelectorActivity.kt index 9187f4b21..d557a6de3 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/UserListSelectorActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/UserListSelectorActivity.kt @@ -55,7 +55,7 @@ class UserListSelectorActivity : BaseActivity(), override var refreshing: Boolean get() { - return supportLoaderManager.hasRunningLoadersSafe() + return LoaderManager.getInstance(this).hasRunningLoadersSafe() } set(value) { } @@ -199,9 +199,9 @@ class UserListSelectorActivity : BaseActivity(), } if (!loaderInitialized) { loaderInitialized = true - supportLoaderManager.initLoader(0, args, this) + LoaderManager.getInstance(this).initLoader(0, args, this) } else { - supportLoaderManager.restartLoader(0, args, this) + LoaderManager.getInstance(this).restartLoader(0, args, this) } } 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 de3a94f7d..e0c5d8034 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/UserSelectorActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/UserSelectorActivity.kt @@ -153,10 +153,10 @@ class UserSelectorActivity : BaseActivity(), OnItemClickListener, LoaderManager. this[EXTRA_FROM_CACHE] = fromCache } if (loaderInitialized) { - supportLoaderManager.initLoader(0, args, this) + LoaderManager.getInstance(this).initLoader(0, args, this) loaderInitialized = true } else { - supportLoaderManager.restartLoader(0, args, this) + LoaderManager.getInstance(this).restartLoader(0, args, this) } } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/WebLinkHandlerActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/WebLinkHandlerActivity.kt index c409f3911..97aa02cd5 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/WebLinkHandlerActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/WebLinkHandlerActivity.kt @@ -177,7 +177,7 @@ class WebLinkHandlerActivity : Activity() { if (pathSegments[0] in TWITTER_RESERVED_PATHS) { return Pair(null, true) } - return handleUserSpecificPageIntent(uri, pathSegments, pathSegments[0]) + return handleUserSpecificPageIntent(pathSegments, pathSegments[0]) } } } @@ -185,7 +185,7 @@ class WebLinkHandlerActivity : Activity() { return Pair(homeIntent, true) } - private fun handleUserSpecificPageIntent(uri: Uri, pathSegments: List, screenName: String): Pair { + private fun handleUserSpecificPageIntent(pathSegments: List, screenName: String): Pair { val segsSize = pathSegments.size if (segsSize == 1) { val builder = Uri.Builder() diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/DummyItemAdapter.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/DummyItemAdapter.kt index 57ac870c8..3be7cf012 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/DummyItemAdapter.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/DummyItemAdapter.kt @@ -104,7 +104,7 @@ class DummyItemAdapter( override fun getAccountKey(position: Int, raw: Boolean) = UserKey.INVALID - override fun findStatusById(accountKey: UserKey, statusId: String) = null + override fun findStatusById(accountKey: UserKey, statusId: String): Nothing? = null override fun isCardNumbersShown(position: Int): Boolean { if (position == RecyclerView.NO_POSITION) return showCardNumbers diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/ParcelableActivitiesAdapter.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/ParcelableActivitiesAdapter.kt index f2e55fc4b..68437cfeb 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/ParcelableActivitiesAdapter.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/ParcelableActivitiesAdapter.kt @@ -22,7 +22,7 @@ package org.mariotaku.twidere.adapter import android.annotation.SuppressLint import android.content.Context import android.database.CursorIndexOutOfBoundsException -import androidx.legacy.widget.Space +import android.widget.Space import androidx.recyclerview.widget.RecyclerView import android.view.LayoutInflater import android.view.View diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/ParcelableStatusesAdapter.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/ParcelableStatusesAdapter.kt index 54bcbc980..890a87304 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/ParcelableStatusesAdapter.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/ParcelableStatusesAdapter.kt @@ -24,7 +24,7 @@ import android.database.CursorIndexOutOfBoundsException import android.util.SparseBooleanArray import android.view.LayoutInflater import android.view.ViewGroup -import androidx.legacy.widget.Space +import android.widget.Space import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.RequestManager import org.mariotaku.kpreferences.get diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/microblog/ActivityExtensions.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/microblog/ActivityExtensions.kt index 8f3f9b0db..ad45439fc 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/microblog/ActivityExtensions.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/microblog/ActivityExtensions.kt @@ -71,26 +71,26 @@ fun Activity.toParcelable(accountKey: UserKey, accountType: String, isGap: Boole it.toParcelable(accountKey, accountType, profileImageSize = profileImageSize) } - result.targets = ParcelableActivity.RelatedObject().also { - it.statuses = targetStatuses?.mapToArray { + result.targets = ParcelableActivity.RelatedObject().also { relatedObject -> + relatedObject.statuses = targetStatuses?.mapToArray { it.toParcelable(accountKey, accountType, profileImageSize) } - it.users = targetUsers?.mapToArray { + relatedObject.users = targetUsers?.mapToArray { it.toParcelable(accountKey, accountType, profileImageSize = profileImageSize) } - it.user_lists = targetUserLists?.mapToArray { + relatedObject.user_lists = targetUserLists?.mapToArray { it.toParcelable(accountKey, profileImageSize = profileImageSize) } } - result.target_objects = ParcelableActivity.RelatedObject().also { - it.statuses = targetObjectStatuses?.mapToArray { + result.target_objects = ParcelableActivity.RelatedObject().also { relatedObject -> + relatedObject.statuses = targetObjectStatuses?.mapToArray { it.toParcelable(accountKey, accountType, profileImageSize) } - it.users = targetObjectUsers?.mapToArray { + relatedObject.users = targetObjectUsers?.mapToArray { it.toParcelable(accountKey, accountType, profileImageSize = profileImageSize) } - it.user_lists = targetObjectUserLists?.mapToArray { + relatedObject.user_lists = targetObjectUserLists?.mapToArray { it.toParcelable(accountKey, profileImageSize = profileImageSize) } } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/APIEditorDialogFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/APIEditorDialogFragment.kt index 4efcfdfb7..2bdeb9464 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/APIEditorDialogFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/APIEditorDialogFragment.kt @@ -152,7 +152,7 @@ class APIEditorDialogFragment : BaseDialogFragment() { adapter = CustomAPIConfigArrayAdapter(requireContext()) val builder = AlertDialog.Builder(requireContext()) builder.setAdapter(adapter, this) - loaderManager.initLoader(0, null, this) + LoaderManager.getInstance(this).initLoader(0, null, this) val dialog = builder.create() dialog.onShow { it.applyTheme() } return dialog 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 551bb68be..87b84594e 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsActivitiesFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsActivitiesFragment.kt @@ -33,6 +33,7 @@ import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView.OnScrollListener import android.view.* +import androidx.loader.app.LoaderManager import com.squareup.otto.Subscribe import kotlinx.android.synthetic.main.fragment_content_recyclerview.* import org.mariotaku.kpreferences.get @@ -110,7 +111,7 @@ abstract class AbsActivitiesFragment protected constructor() : val loaderArgs = Bundle(arguments) loaderArgs.putBoolean(EXTRA_FROM_USER, true) - loaderManager.initLoader(loaderId, loaderArgs, this) + LoaderManager.getInstance(this).initLoader(loaderId, loaderArgs, this) showProgress() } @@ -531,7 +532,7 @@ abstract class AbsActivitiesFragment protected constructor() : return true } else -> activity?.let { - fragmentManager?.let { fragmentManager -> + parentFragmentManager.let { fragmentManager -> MenuUtils.handleStatusClick(it, this, fragmentManager, preferences, userColorNameManager, twitterWrapper, status, item) } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsMediaStatusesFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsMediaStatusesFragment.kt index efa94888d..14e9e7466 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsMediaStatusesFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsMediaStatusesFragment.kt @@ -21,6 +21,7 @@ package org.mariotaku.twidere.fragment import android.content.Context import android.os.Bundle +import androidx.loader.app.LoaderManager import androidx.loader.app.LoaderManager.LoaderCallbacks import androidx.loader.app.hasRunningLoadersSafe import androidx.loader.content.Loader @@ -49,7 +50,7 @@ abstract class AbsMediaStatusesFragment : AbsContentRecyclerViewFragment return MenuUtils.handleStatusClick(requireActivity(), this, requireFragmentManager(), + else -> return MenuUtils.handleStatusClick(requireActivity(), this, parentFragmentManager, preferences, userColorNameManager, twitterWrapper, status, item) } } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AccountsDashboardFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AccountsDashboardFragment.kt index 42b1e12c6..6ab1efc53 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AccountsDashboardFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AccountsDashboardFragment.kt @@ -46,6 +46,7 @@ import androidx.appcompat.view.SupportMenuInflater import androidx.appcompat.widget.ActionMenuView.OnMenuItemClickListener import androidx.core.content.ContextCompat import androidx.core.view.MenuItemCompat +import androidx.loader.app.LoaderManager import androidx.loader.app.LoaderManager.LoaderCallbacks import androidx.loader.content.FixedAsyncTaskLoader import androidx.loader.content.Loader @@ -286,9 +287,9 @@ class AccountsDashboardFragment : BaseFragment(), LoaderCallbacks, fun loadAccounts() { if (!loaderInitialized) { loaderInitialized = true - loaderManager.initLoader(0, null, this) + LoaderManager.getInstance(this).initLoader(0, null, this) } else { - loaderManager.restartLoader(0, null, this) + LoaderManager.getInstance(this).restartLoader(0, null, this) } } @@ -659,7 +660,25 @@ class AccountsDashboardFragment : BaseFragment(), LoaderCallbacks, data class AccountsInfo( val accounts: Array, val draftsCount: Int - ) + ) { + override fun equals(other: Any?): Boolean { + if (this === other) return true + if (javaClass != other?.javaClass) return false + + other as AccountsInfo + + if (!accounts.contentEquals(other.accounts)) return false + if (draftsCount != other.draftsCount) return false + + return true + } + + override fun hashCode(): Int { + var result = accounts.contentHashCode() + result = 31 * result + draftsCount + return result + } + } class AccountsInfoLoader( context: Context, diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AccountsManagerFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AccountsManagerFragment.kt index b87fe9f65..e63c0ca4c 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AccountsManagerFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AccountsManagerFragment.kt @@ -86,7 +86,7 @@ class AccountsManagerFragment : BaseFragment(), LoaderManager.LoaderCallbacks
  • , MultiChoice df.arguments = Bundle { this[EXTRA_OBJECT] = tab } - fragmentManager?.let { df.show(it, TabEditorDialogFragment.TAG_EDIT_TAB) } + parentFragmentManager.let { df.show(it, TabEditorDialogFragment.TAG_EDIT_TAB) } } listView.adapter = adapter listView.emptyView = emptyView @@ -115,7 +116,7 @@ class CustomTabsFragment : BaseFragment(), LoaderCallbacks, MultiChoice } emptyText.setText(R.string.no_tab) emptyIcon.setImageResource(R.drawable.ic_info_tab) - loaderManager.initLoader(0, null, this) + LoaderManager.getInstance(this).initLoader(0, null, this) setListShown(false) } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/EditUserListDialogFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/EditUserListDialogFragment.kt index 75226fdbc..217e4a7cc 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/EditUserListDialogFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/EditUserListDialogFragment.kt @@ -46,13 +46,13 @@ class EditUserListDialogFragment : BaseDialogFragment() { builder.positive(android.R.string.ok, this::onPositiveClick) builder.setNegativeButton(android.R.string.cancel, null) val dialog = builder.create() - dialog.onShow { dialog -> - dialog.applyTheme() - dialog.editName.addValidator(UserListNameValidator(getString(R.string.invalid_list_name))) + dialog.onShow { alertDialog -> + alertDialog.applyTheme() + alertDialog.editName.addValidator(UserListNameValidator(getString(R.string.invalid_list_name))) if (savedInstanceState == null) { - dialog.editName.setText(arguments?.getString(EXTRA_LIST_NAME)) - dialog.editDescription.setText(arguments?.getString(EXTRA_DESCRIPTION)) - dialog.isPublic.isChecked = arguments?.getBoolean(EXTRA_IS_PUBLIC, true) ?: true + alertDialog.editName.setText(arguments?.getString(EXTRA_LIST_NAME)) + alertDialog.editDescription.setText(arguments?.getString(EXTRA_DESCRIPTION)) + alertDialog.isPublic.isChecked = arguments?.getBoolean(EXTRA_IS_PUBLIC, true) ?: true } } return dialog diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ExtensionsListFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ExtensionsListFragment.kt index 28b50c5d7..a621c11ca 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ExtensionsListFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ExtensionsListFragment.kt @@ -33,6 +33,7 @@ import android.view.MenuItem import android.view.View import android.widget.AdapterView import android.widget.AdapterView.AdapterContextMenuInfo +import androidx.loader.app.LoaderManager import com.bumptech.glide.RequestManager import kotlinx.android.synthetic.main.fragment_content_listview.* import org.mariotaku.ktextension.isNullOrEmpty @@ -52,7 +53,7 @@ class ExtensionsListFragment : AbsContentListViewFragment(), listView.onItemClickListener = this - loaderManager.initLoader(0, null, this) + LoaderManager.getInstance(this).initLoader(0, null, this) showProgress() } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/GroupFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/GroupFragment.kt index 4f7925964..3911bb29c 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/GroupFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/GroupFragment.kt @@ -5,6 +5,7 @@ import android.nfc.NdefMessage import android.nfc.NdefRecord import android.nfc.NfcAdapter import android.os.Bundle +import androidx.loader.app.LoaderManager import androidx.loader.app.LoaderManager.LoaderCallbacks import androidx.loader.content.FixedAsyncTaskLoader import androidx.loader.content.Loader @@ -69,7 +70,7 @@ class GroupFragment : AbsToolbarTabPagesFragment(), LoaderCallbacks { val df = AddMappingDialogFragment() - fragmentManager?.let { df.show(it, "add_mapping") } + parentFragmentManager.let { df.show(it, "add_mapping") } } } return super.onOptionsItemSelected(item) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ItemsListFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ItemsListFragment.kt index 9e91d53a6..2ca47a4af 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ItemsListFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ItemsListFragment.kt @@ -11,6 +11,7 @@ import android.view.ContextMenu import android.view.MenuInflater import android.view.MenuItem import android.view.View +import androidx.loader.app.LoaderManager import com.bumptech.glide.RequestManager import kotlinx.android.synthetic.main.fragment_content_recyclerview.* import org.mariotaku.kpreferences.get @@ -46,7 +47,7 @@ open class ItemsListFragment : AbsContentListRecyclerViewFragment?> { diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ParcelableStatusesFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ParcelableStatusesFragment.kt index d68cda6a7..c2b6f0b59 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ParcelableStatusesFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ParcelableStatusesFragment.kt @@ -24,6 +24,7 @@ import android.os.Bundle import androidx.loader.app.hasRunningLoadersSafe import androidx.loader.content.Loader import android.text.TextUtils +import androidx.loader.app.LoaderManager import com.bumptech.glide.RequestManager import com.squareup.otto.Subscribe import org.mariotaku.twidere.R @@ -57,7 +58,7 @@ abstract class ParcelableStatusesFragment : AbsStatusesFragment() { override var refreshing: Boolean get() { if (context == null || isDetached) return false - return loaderManager.hasRunningLoadersSafe() + return LoaderManager.getInstance(this).hasRunningLoadersSafe() } set(value) { super.refreshing = value @@ -113,7 +114,7 @@ abstract class ParcelableStatusesFragment : AbsStatusesFragment() { args.putBoolean(EXTRA_LOADING_MORE, param.isLoadingMore) args.putBoolean(EXTRA_FROM_USER, true) args.putParcelable(EXTRA_PAGINATION, param.pagination?.getOrNull(0)) - loaderManager.restartLoader(loaderId, args, this) + LoaderManager.getInstance(this).restartLoader(loaderId, args, this) return true } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ParcelableUserListsFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ParcelableUserListsFragment.kt index bc8111859..65559d509 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ParcelableUserListsFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ParcelableUserListsFragment.kt @@ -21,6 +21,7 @@ package org.mariotaku.twidere.fragment import android.content.Context import android.os.Bundle +import androidx.loader.app.LoaderManager import androidx.loader.app.LoaderManager.LoaderCallbacks import androidx.loader.app.hasRunningLoadersSafe import androidx.loader.content.Loader @@ -62,7 +63,7 @@ abstract class ParcelableUserListsFragment : AbsContentListRecyclerViewFragment< override var refreshing: Boolean get() { if (context == null || isDetached) return false - return loaderManager.hasRunningLoadersSafe() + return LoaderManager.getInstance(this).hasRunningLoadersSafe() } set(value) { super.refreshing = value @@ -103,7 +104,7 @@ abstract class ParcelableUserListsFragment : AbsContentListRecyclerViewFragment< val loaderArgs = Bundle(arguments) loaderArgs.putBoolean(EXTRA_FROM_USER, true) loaderArgs.putParcelable(EXTRA_PAGINATION, nextPagination) - loaderManager.restartLoader(0, loaderArgs, this) + LoaderManager.getInstance(this).restartLoader(0, loaderArgs, this) } override fun handleKeyboardShortcutSingle(handler: KeyboardShortcutsHandler, keyCode: Int, @@ -130,7 +131,7 @@ abstract class ParcelableUserListsFragment : AbsContentListRecyclerViewFragment< this) val loaderArgs = Bundle(arguments) loaderArgs.putBoolean(EXTRA_FROM_USER, true) - loaderManager.initLoader(0, loaderArgs, this) + LoaderManager.getInstance(this).initLoader(0, loaderArgs, this) } override fun onCreateLoader(id: Int, args: Bundle?): Loader> { @@ -159,7 +160,7 @@ abstract class ParcelableUserListsFragment : AbsContentListRecyclerViewFragment< val loaderArgs = Bundle(arguments).apply { this[EXTRA_FROM_USER] = true } - loaderManager.restartLoader(0, loaderArgs, this) + LoaderManager.getInstance(this).restartLoader(0, loaderArgs, this) showProgress() return true } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ParcelableUsersFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ParcelableUsersFragment.kt index 6a32187f0..4a2c05dcc 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ParcelableUsersFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ParcelableUsersFragment.kt @@ -28,6 +28,7 @@ import androidx.loader.content.Loader import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import android.view.KeyEvent +import androidx.loader.app.LoaderManager import com.bumptech.glide.RequestManager import com.squareup.otto.Subscribe import kotlinx.android.synthetic.main.fragment_content_recyclerview.* @@ -65,7 +66,7 @@ abstract class ParcelableUsersFragment : AbsContentListRecyclerViewFragment, child: View, position: Int, id: Long): Boolean { val item = adapter.findItem(id) ?: return false - fragmentManager?.let { DestroySavedSearchDialogFragment.show(it, accountKey, item.id, item.name) } + parentFragmentManager.let { DestroySavedSearchDialogFragment.show(it, accountKey, item.id, item.name) } return true } @@ -104,7 +105,7 @@ class SavedSearchesListFragment : AbsContentListViewFragment(), L override fun onActivityCreated(savedInstanceState: Bundle?) { super.onActivityCreated(savedInstanceState) listView.onItemClickListener = this - loaderManager.initLoader(0, null, this) + LoaderManager.getInstance(this).initLoader(0, null, this) showProgress() } @@ -123,7 +124,7 @@ class TrendsSuggestionsFragment : AbsContentListViewFragment(), L override fun onStart() { super.onStart() - loaderManager.restartLoader(0, null, this) + LoaderManager.getInstance(this).restartLoader(0, null, this) bus.register(this) } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserFragment.kt index 140da6573..6961c639b 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserFragment.kt @@ -73,6 +73,7 @@ import android.view.View.OnTouchListener import android.view.animation.AnimationUtils import android.widget.TextView import android.widget.Toast +import androidx.loader.app.LoaderManager import com.squareup.otto.Subscribe import kotlinx.android.synthetic.main.fragment_user.* import kotlinx.android.synthetic.main.fragment_user.view.* @@ -432,7 +433,7 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener, } profileImage.visibility = View.VISIBLE val resources = resources - val lm = loaderManager + val lm = LoaderManager.getInstance(this) lm.destroyLoader(LOADER_ID_USER) lm.destroyLoader(LOADER_ID_FRIENDSHIP) cardContent.visibility = View.VISIBLE @@ -530,7 +531,7 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener, externalThemeManager.emoji?.applyTo(it) } - val userCreationDay = condition@ if (user.created_at >= 0) { + val userCreationDay = if (user.created_at >= 0) { val cal = Calendar.getInstance() val currentMonth = cal.get(Calendar.MONTH) val currentDay = cal.get(Calendar.DAY_OF_MONTH) @@ -577,7 +578,7 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener, fun getUserInfo(accountKey: UserKey, userKey: UserKey?, screenName: String?, omitIntentExtra: Boolean) { - val lm = loaderManager + val lm = LoaderManager.getInstance(this) lm.destroyLoader(LOADER_ID_USER) lm.destroyLoader(LOADER_ID_FRIENDSHIP) val args = Bundle() @@ -787,7 +788,7 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener, override fun onDestroyView() { user = null relationship = null - val lm = loaderManager + val lm = LoaderManager.getInstance(this) lm.destroyLoader(LOADER_ID_USER) lm.destroyLoader(LOADER_ID_FRIENDSHIP) super.onDestroyView() @@ -903,7 +904,7 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener, val twitter = twitterWrapper val user = user ?: return false val accountKey = user.account_key ?: return false - val currentFragmentManager = fragmentManager ?: return false + val currentFragmentManager = parentFragmentManager val userRelationship = relationship when (item.itemId) { R.id.block -> { @@ -1221,7 +1222,7 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener, override fun onClick(view: View) { val activity = activity ?: return - val fragmentManager = fragmentManager ?: return + val fragmentManager = parentFragmentManager val user = user ?: return val accountKey = user.account_key ?: return when (view.id) { @@ -1394,7 +1395,7 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener, private fun getFriendship() { val user = user ?: return relationship = null - val lm = loaderManager + val lm = LoaderManager.getInstance(this) lm.destroyLoader(LOADER_ID_FRIENDSHIP) val args = Bundle() args.putParcelable(EXTRA_ACCOUNT_KEY, user.account_key) @@ -1890,7 +1891,7 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener, df.arguments = Bundle { this[EXTRA_ACCOUNT_KEY] = accountKey } - df.show(requireFragmentManager(), "create_user_list") + df.show(parentFragmentManager, "create_user_list") } } return dialog diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserListFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserListFragment.kt index 64eb99029..db975cf39 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserListFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserListFragment.kt @@ -28,6 +28,7 @@ import android.nfc.NdefMessage import android.nfc.NdefRecord import android.nfc.NfcAdapter.CreateNdefMessageCallback import android.os.Bundle +import androidx.loader.app.LoaderManager import androidx.loader.app.LoaderManager.LoaderCallbacks import androidx.loader.content.FixedAsyncTaskLoader import androidx.loader.content.Loader @@ -81,7 +82,7 @@ class UserListFragment : AbsToolbarTabPagesFragment(), OnClickListener, fun displayUserList(userList: ParcelableUserList?) { val activity = activity ?: return - loaderManager.destroyLoader(0) + LoaderManager.getInstance(this).destroyLoader(0) this.userList = userList if (userList != null) { @@ -93,7 +94,7 @@ class UserListFragment : AbsToolbarTabPagesFragment(), OnClickListener, } fun getUserListInfo(omitIntentExtra: Boolean) { - val lm = loaderManager + val lm = LoaderManager.getInstance(this) lm.destroyLoader(0) val args = Bundle(arguments) args.putBoolean(EXTRA_OMIT_INTENT_EXTRA, omitIntentExtra) @@ -180,7 +181,7 @@ class UserListFragment : AbsToolbarTabPagesFragment(), OnClickListener, override fun onDestroyView() { userList = null - loaderManager.destroyLoader(0) + LoaderManager.getInstance(this).destroyLoader(0) super.onDestroyView() } @@ -227,7 +228,7 @@ class UserListFragment : AbsToolbarTabPagesFragment(), OnClickListener, val twitter = twitterWrapper val userList = userList ?: return false val activity = activity ?: return false - val fragmentManager = fragmentManager ?: return false + val fragmentManager = parentFragmentManager when (item.itemId) { R.id.add -> { if (userList.user_key != userList.account_key) return false diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserListsOwnershipsFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserListsOwnershipsFragment.kt index 5e3e7c25a..bfeb921b4 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserListsOwnershipsFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserListsOwnershipsFragment.kt @@ -68,7 +68,7 @@ class UserListsOwnershipsFragment : ParcelableUserListsFragment() { val args = Bundle() args.putParcelable(EXTRA_ACCOUNT_KEY, accountKey) f.arguments = args - fragmentManager?.let { f.show(it, null) } + parentFragmentManager.let { f.show(it, null) } return true } } 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 8aa3ea90c..74b390225 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserProfileEditorFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserProfileEditorFragment.kt @@ -33,6 +33,7 @@ import android.text.TextUtils.isEmpty import android.view.* import android.view.View.OnClickListener import android.widget.Toast +import androidx.loader.app.LoaderManager import com.twitter.twittertext.Validator import kotlinx.android.synthetic.main.fragment_user_profile_editor.* import nl.komponents.kovenant.combine.and @@ -337,7 +338,7 @@ class UserProfileEditorFragment : BaseFragment(), OnSizeChangedListener, private fun getUserInfo() { if (activity == null || isDetached) return - val lm = loaderManager + val lm = LoaderManager.getInstance(this) lm.destroyLoader(LOADER_ID_USER) getUserInfoCalled = true if (userInfoLoaderInitialized) { diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserQrDialogFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserQrDialogFragment.kt index 78870607b..17bfeb902 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserQrDialogFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserQrDialogFragment.kt @@ -125,13 +125,13 @@ class UserQrDialogFragment : BaseDialogFragment() { return task { try { return@task requestManager.loadOriginalProfileImage(requireContext(), user, 0) - .into(Target.SIZE_ORIGINAL, Target.SIZE_ORIGINAL).get() + .submit(Target.SIZE_ORIGINAL, Target.SIZE_ORIGINAL).get() } catch (e: ExecutionException) { // Ignore } // Return fallback profile image return@task requestManager.loadProfileImage(requireContext(), user, 0, size = profileImageSize) - .into(Target.SIZE_ORIGINAL, Target.SIZE_ORIGINAL).get() + .submit(Target.SIZE_ORIGINAL, Target.SIZE_ORIGINAL).get() } } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/drafts/DraftsListFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/drafts/DraftsListFragment.kt index b266b6696..063faca16 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/drafts/DraftsListFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/drafts/DraftsListFragment.kt @@ -41,6 +41,7 @@ import android.widget.AbsListView.MultiChoiceModeListener import android.widget.AdapterView import android.widget.AdapterView.OnItemClickListener import android.widget.ListView +import androidx.loader.app.LoaderManager import com.bumptech.glide.RequestManager import kotlinx.android.synthetic.main.fragment_content_listview.* import org.mariotaku.kpreferences.get @@ -84,7 +85,7 @@ class DraftsListFragment : AbsContentListViewFragment(), LoaderCa listView.choiceMode = ListView.CHOICE_MODE_MULTIPLE_MODAL listView.setMultiChoiceModeListener(this) refreshEnabled = false - loaderManager.initLoader(0, null, this) + LoaderManager.getInstance(this).initLoader(0, null, this) showProgress() } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/AddEditItemFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/AddEditItemFragment.kt index 02e134849..da7cca06f 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/AddEditItemFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/AddEditItemFragment.kt @@ -151,7 +151,7 @@ class AddEditItemFragment : BaseDialogFragment() { val df = ExtraFeaturesIntroductionDialogFragment.create( ExtraFeaturesService.FEATURE_ADVANCED_FILTERS) df.setTargetFragment(this@AddEditItemFragment, REQUEST_CHANGE_SCOPE_PURCHASE) - df.show(requireFragmentManager(), ExtraFeaturesIntroductionDialogFragment.FRAGMENT_TAG) + df.show(parentFragmentManager, ExtraFeaturesIntroductionDialogFragment.FRAGMENT_TAG) } } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/BaseFiltersFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/BaseFiltersFragment.kt index b5ca06376..ed897908e 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/BaseFiltersFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/BaseFiltersFragment.kt @@ -88,7 +88,7 @@ abstract class BaseFiltersFragment : AbsContentListViewFragment if (!extraFeaturesService.isAdvancedFiltersEnabled) { - ExtraFeaturesIntroductionDialogFragment.show(requireFragmentManager(), + ExtraFeaturesIntroductionDialogFragment.show(parentFragmentManager, feature = ExtraFeaturesService.FEATURE_ADVANCED_FILTERS, requestCode = REQUEST_PURCHASE_EXTRA_FEATURES) return@listener false diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/FiltersSubscriptionsFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/FiltersSubscriptionsFragment.kt index fffad9752..b267a3f94 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/FiltersSubscriptionsFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/FiltersSubscriptionsFragment.kt @@ -67,7 +67,7 @@ class FiltersSubscriptionsFragment : BaseFragment(), LoaderManager.LoaderCallbac listContainer.visibility = View.GONE progressContainer.visibility = View.VISIBLE - loaderManager.initLoader(0, null, this) + LoaderManager.getInstance(this).initLoader(0, null, this) if (!extraFeaturesService.isSupported()) { @@ -76,7 +76,7 @@ class FiltersSubscriptionsFragment : BaseFragment(), LoaderManager.LoaderCallbac } if (savedInstanceState == null) { - fragmentManager?.let { fragmentManager -> + parentFragmentManager.let { fragmentManager -> when (arguments?.getString(EXTRA_ACTION)) { ACTION_ADD_URL_SUBSCRIPTION -> { if (!extraFeaturesService.isAdvancedFiltersEnabled) { @@ -131,17 +131,17 @@ class FiltersSubscriptionsFragment : BaseFragment(), LoaderManager.LoaderCallbac when (item.itemId) { R.id.add -> { val df = AddUrlSubscriptionDialogFragment() - fragmentManager?.let { df.show(it, "add_url_subscription") } + parentFragmentManager.let { df.show(it, "add_url_subscription") } return true } R.id.refresh -> { executeAfterFragmentResumed { fragment -> - ProgressDialogFragment.show(fragment.childFragmentManager, FRAGMENT_TAG_RREFRESH_FILTERS) + ProgressDialogFragment.show(fragment.childFragmentManager, FRAGMENT_TAG_REFRESH_FILTERS) val task = RefreshFiltersSubscriptionsTask(fragment.requireContext()) val fragmentRef = WeakReference(fragment) task.callback = { fragmentRef.get()?.executeAfterFragmentResumed { fragment -> - fragment.fragmentManager?.dismissDialogFragment(FRAGMENT_TAG_RREFRESH_FILTERS) + fragment.parentFragmentManager.dismissDialogFragment(FRAGMENT_TAG_REFRESH_FILTERS) } } TaskStarter.execute(task) @@ -255,7 +255,7 @@ class FiltersSubscriptionsFragment : BaseFragment(), LoaderManager.LoaderCallbac this[EXTRA_ADD_SUBSCRIPTION_URL] = arguments?.getString(EXTRA_ADD_SUBSCRIPTION_URL) this[EXTRA_ADD_SUBSCRIPTION_NAME] = arguments?.getString(EXTRA_ADD_SUBSCRIPTION_NAME) } - fragmentManager?.let { df.show(it, "add_url_subscription") } + parentFragmentManager.let { df.show(it, "add_url_subscription") } } class FilterSubscriptionsAdapter(context: Context) : SimpleCursorAdapter(context, @@ -337,7 +337,7 @@ class FiltersSubscriptionsFragment : BaseFragment(), LoaderManager.LoaderCallbac const val EXTRA_ADD_SUBSCRIPTION_URL = "add_subscription.url" const val EXTRA_ADD_SUBSCRIPTION_NAME = "add_subscription.name" private const val REQUEST_ADD_URL_SUBSCRIPTION_PURCHASE = 101 - private const val FRAGMENT_TAG_RREFRESH_FILTERS = "refresh_filters" + private const val FRAGMENT_TAG_REFRESH_FILTERS = "refresh_filters" } } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/message/MessageConversationInfoFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/message/MessageConversationInfoFragment.kt index 35835f5ce..a9b77eefd 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/message/MessageConversationInfoFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/message/MessageConversationInfoFragment.kt @@ -28,20 +28,20 @@ import android.content.Intent import android.graphics.Rect import android.net.Uri import android.os.Bundle +import android.view.* +import android.widget.CompoundButton +import android.widget.EditText +import androidx.appcompat.app.AlertDialog +import androidx.appcompat.app.AppCompatActivity +import androidx.appcompat.widget.Toolbar import androidx.fragment.app.DialogFragment import androidx.fragment.app.FragmentActivity import androidx.loader.app.LoaderManager import androidx.loader.content.FixedAsyncTaskLoader import androidx.loader.content.Loader -import androidx.appcompat.app.AlertDialog -import androidx.appcompat.app.AppCompatActivity import androidx.recyclerview.widget.FixedLinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import androidx.appcompat.widget.Toolbar -import android.view.* -import android.widget.CompoundButton -import android.widget.EditText import com.bumptech.glide.RequestManager import kotlinx.android.synthetic.main.activity_home_content.view.* import kotlinx.android.synthetic.main.fragment_messages_conversation_info.* @@ -72,7 +72,6 @@ import org.mariotaku.twidere.adapter.iface.IItemCountsAdapter import org.mariotaku.twidere.annotation.AccountType import org.mariotaku.twidere.annotation.ImageShapeStyle import org.mariotaku.twidere.annotation.ProfileImageSize -import org.mariotaku.twidere.constant.IntentConstants import org.mariotaku.twidere.constant.IntentConstants.* import org.mariotaku.twidere.constant.nameFirstKey import org.mariotaku.twidere.constant.profileImageStyleKey @@ -182,7 +181,7 @@ class MessageConversationInfoFragment : BaseFragment(), IToolBarSupportFragment, } } - loaderManager.initLoader(0, null, this) + LoaderManager.getInstance(this).initLoader(0, null, this) } override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { @@ -331,10 +330,10 @@ class MessageConversationInfoFragment : BaseFragment(), IToolBarSupportFragment, ProgressDialogFragment.show(childFragmentManager, "add_participant_progress") val weakThis = WeakReference(this) val task = AddParticipantsTask(requireContext(), accountKey, conversationId, listOf(user)) - task.callback = callback@ { succeed -> + task.callback = callback@ { val f = weakThis.get() ?: return@callback f.dismissDialogThen("add_participant_progress") { - loaderManager.restartLoader(0, null, this) + LoaderManager.getInstance(this).restartLoader(0, null, this) } } TaskStarter.execute(task) @@ -347,7 +346,7 @@ class MessageConversationInfoFragment : BaseFragment(), IToolBarSupportFragment, task.callback = callback@ { _ -> val f = weakThis.get() ?: return@callback f.dismissDialogThen("set_notifications_disabled_progress") { - loaderManager.restartLoader(0, null, this) + LoaderManager.getInstance(this).restartLoader(0, null, this) } } TaskStarter.execute(task) @@ -470,7 +469,7 @@ class MessageConversationInfoFragment : BaseFragment(), IToolBarSupportFragment, }.alwaysUi { val fragment = weakThis.get() ?: return@alwaysUi fragment.dismissDialogThen(tag) { - loaderManager.restartLoader(0, null, this) + LoaderManager.getInstance(this).restartLoader(0, null, this) } } } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/message/MessageNewConversationFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/message/MessageNewConversationFragment.kt index 43d4d1eec..bddb2df15 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/message/MessageNewConversationFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/message/MessageNewConversationFragment.kt @@ -25,16 +25,17 @@ import android.graphics.Canvas import android.graphics.Paint import android.graphics.RectF import android.os.Bundle -import androidx.annotation.WorkerThread -import androidx.loader.app.LoaderManager.LoaderCallbacks -import androidx.loader.content.Loader -import androidx.recyclerview.widget.LinearLayoutManager import android.text.Editable import android.text.Spannable import android.text.SpannableStringBuilder import android.text.TextUtils import android.text.style.ReplacementSpan import android.view.* +import androidx.annotation.WorkerThread +import androidx.loader.app.LoaderManager +import androidx.loader.app.LoaderManager.LoaderCallbacks +import androidx.loader.content.Loader +import androidx.recyclerview.widget.LinearLayoutManager import kotlinx.android.synthetic.main.fragment_messages_conversation_new.* import org.mariotaku.kpreferences.get import org.mariotaku.ktextension.* @@ -305,10 +306,10 @@ class MessageNewConversationFragment : BaseFragment(), LoaderCallbacks + val context = alertDialog.context + alertDialog.applyTheme() val am = AccountManager.get(context) val details = AccountUtils.getAccountDetails(am, accountKey, true) ?: run { @@ -89,7 +89,7 @@ abstract class AbsStatusDialogFragment : BaseDialogFragment() { return@onShow } val weakThis = WeakReference(this) - val weakHolder = WeakReference(StatusViewHolder(adapter = adapter, itemView = it.itemContent).apply { + val weakHolder = WeakReference(StatusViewHolder(adapter = adapter, itemView = alertDialog.itemContent).apply { setupViewOptions() }) val extraStatus = status diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/BlockStatusUsersDialogFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/BlockStatusUsersDialogFragment.kt index 7bea40eca..510a4aaff 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/BlockStatusUsersDialogFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/BlockStatusUsersDialogFragment.kt @@ -50,7 +50,7 @@ class BlockStatusUsersDialogFragment : BaseDialogFragment() { }.toTypedArray() builder.setTitle(R.string.action_status_block_users) builder.setItems(displayNames) { _, which -> - CreateUserBlockDialogFragment.show(requireFragmentManager(), referencedUsers[which]) + CreateUserBlockDialogFragment.show(parentFragmentManager, referencedUsers[which]) } val dialog = builder.create() dialog.applyOnShow { applyTheme() } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/MuteStatusUsersDialogFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/MuteStatusUsersDialogFragment.kt index d93d6306c..409b66e56 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/MuteStatusUsersDialogFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/MuteStatusUsersDialogFragment.kt @@ -50,7 +50,7 @@ class MuteStatusUsersDialogFragment : BaseDialogFragment() { }.toTypedArray() builder.setTitle(R.string.action_status_mute_users) builder.setItems(displayNames) { _, which -> - CreateUserMuteDialogFragment.show(requireFragmentManager(), referencedUsers[which]) + CreateUserMuteDialogFragment.show(parentFragmentManager, referencedUsers[which]) } val dialog = builder.create() dialog.onShow { it.applyTheme() } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/StatusFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/StatusFragment.kt index 8a71d837f..eea9202aa 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/StatusFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/StatusFragment.kt @@ -36,6 +36,7 @@ import android.text.TextUtils import android.view.* import android.widget.Toast import androidx.appcompat.app.AlertDialog +import androidx.loader.app.LoaderManager import androidx.loader.app.LoaderManager.LoaderCallbacks import androidx.loader.app.hasRunningLoadersSafe import androidx.loader.content.FixedAsyncTaskLoader @@ -210,7 +211,7 @@ class StatusFragment : BaseFragment(), LoaderCallbacks { @@ -261,7 +262,7 @@ class StatusFragment : BaseFragment(), LoaderCallbacks currentIndex.set(which) } - builder.setPositiveButton(android.R.string.ok) lambda@ { di, _ -> + builder.setPositiveButton(android.R.string.ok) lambda@ { _, _ -> val idx = currentIndex.get() if (idx < 0) return@lambda preferences[translationDestinationKey] = languages[idx].code diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/MediaStatusesSearchFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/MediaStatusesSearchFragment.kt index 6f556dea1..fe6ce3a74 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/MediaStatusesSearchFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/MediaStatusesSearchFragment.kt @@ -21,6 +21,7 @@ package org.mariotaku.twidere.fragment.statuses import android.content.Context import android.os.Bundle +import androidx.loader.app.LoaderManager import androidx.loader.content.Loader import org.mariotaku.twidere.TwidereConstants.* import org.mariotaku.twidere.fragment.AbsMediaStatusesFragment @@ -52,7 +53,7 @@ class MediaStatusesSearchFragment : AbsMediaStatusesFragment() { args.putString(EXTRA_MAX_ID, maxId) args.putString(EXTRA_SINCE_ID, sinceId) args.putBoolean(EXTRA_FROM_USER, true) - loaderManager.restartLoader(loaderId, args, this) + LoaderManager.getInstance(this).restartLoader(loaderId, args, this) return 0 } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/UserMediaTimelineFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/UserMediaTimelineFragment.kt index 3063367ce..8e256b270 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/UserMediaTimelineFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/UserMediaTimelineFragment.kt @@ -21,6 +21,7 @@ package org.mariotaku.twidere.fragment.statuses import android.content.Context import android.os.Bundle +import androidx.loader.app.LoaderManager import androidx.loader.content.Loader import org.mariotaku.twidere.constant.IntentConstants.* import org.mariotaku.twidere.fragment.AbsMediaStatusesFragment @@ -52,7 +53,7 @@ class UserMediaTimelineFragment : AbsMediaStatusesFragment() { args.putString(EXTRA_MAX_ID, maxId) args.putString(EXTRA_SINCE_ID, sinceId) args.putBoolean(EXTRA_FROM_USER, true) - loaderManager.restartLoader(loaderId, args, this) + LoaderManager.getInstance(this).restartLoader(loaderId, args, this) return 0 } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/UserTimelineFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/UserTimelineFragment.kt index 328d02dd0..598e2e671 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/UserTimelineFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/statuses/UserTimelineFragment.kt @@ -138,7 +138,7 @@ class UserTimelineFragment : ParcelableStatusesFragment() { override fun onFilterClick(holder: TimelineFilterHeaderViewHolder) { val df = UserTimelineFilterDialogFragment() df.setTargetFragment(this, REQUEST_SET_TIMELINE_FILTER) - fragmentManager?.let { df.show(it, "set_timeline_filter") } + parentFragmentManager.let { df.show(it, "set_timeline_filter") } } @Subscribe diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/users/UserListMembersFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/users/UserListMembersFragment.kt index 2633a7f15..a414cc6f3 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/users/UserListMembersFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/users/UserListMembersFragment.kt @@ -110,7 +110,7 @@ class UserListMembersFragment : ParcelableUsersFragment() { val user = adapter.getUser(contextMenuInfo.position) ?: return false when (item.itemId) { R.id.delete_from_list -> { - fragmentManager?.let { DeleteUserListMembersDialogFragment.show(it, userList, user) } + parentFragmentManager.let { DeleteUserListMembersDialogFragment.show(it, userList, user) } return true } } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/ExtensionsListLoader.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/ExtensionsListLoader.kt index b00771bc4..6d20807bb 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/ExtensionsListLoader.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/ExtensionsListLoader.kt @@ -118,6 +118,35 @@ class ExtensionsListLoader( info.metaData?.getString(METADATA_KEY_EXTENSION_SETTINGS) ) + override fun equals(other: Any?): Boolean { + if (this === other) return true + if (javaClass != other?.javaClass) return false + + other as ExtensionInfo + + if (packageName != other.packageName) return false + if (label != other.label) return false + if (description != other.description) return false + if (icon != other.icon) return false + if (permissions != null) { + if (other.permissions == null) return false + if (!permissions.contentEquals(other.permissions)) return false + } else if (other.permissions != null) return false + if (settings != other.settings) return false + + return true + } + + override fun hashCode(): Int { + var result = packageName.hashCode() + result = 31 * result + label.hashCode() + result = 31 * result + (description?.hashCode() ?: 0) + result = 31 * result + (icon?.hashCode() ?: 0) + result = 31 * result + (permissions?.contentHashCode() ?: 0) + result = 31 * result + (settings?.hashCode() ?: 0) + return result + } + } /** @@ -126,8 +155,8 @@ class ExtensionsListLoader( */ class InterestingConfigChanges { - internal val lastConfiguration = Configuration() - internal var lastDensity: Int = 0 + private val lastConfiguration = Configuration() + private var lastDensity: Int = 0 internal fun applyNewConfig(res: Resources): Boolean { val configChanges = lastConfiguration.updateFrom(res.configuration) @@ -165,7 +194,7 @@ class ExtensionsListLoader( } } - class ExtensionInfoComparator(val collator: Collator) : Comparator { + class ExtensionInfoComparator(private val collator: Collator) : Comparator { override fun compare(o1: ExtensionInfo, o2: ExtensionInfo): Int { val label1 = o1.label.toString() val label2 = o2.label.toString() diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/model/ParameterizedExpression.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/model/ParameterizedExpression.kt index 9dd31a716..f0735b8d5 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/model/ParameterizedExpression.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/model/ParameterizedExpression.kt @@ -27,4 +27,22 @@ import org.mariotaku.sqliteqb.library.Expression data class ParameterizedExpression(var expression: Expression, val parameters: Array) { val sql: String get() = expression.sql + + override fun equals(other: Any?): Boolean { + if (this === other) return true + if (javaClass != other?.javaClass) return false + + other as ParameterizedExpression + + if (expression != other.expression) return false + if (!parameters.contentEquals(other.parameters)) return false + + return true + } + + override fun hashCode(): Int { + var result = expression.hashCode() + result = 31 * result + parameters.contentHashCode() + return result + } } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/model/util/ParcelableRelationshipUtils.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/model/util/ParcelableRelationshipUtils.kt index 601c58569..3cc7f0b6d 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/model/util/ParcelableRelationshipUtils.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/model/util/ParcelableRelationshipUtils.kt @@ -69,15 +69,15 @@ object ParcelableRelationshipUtils { */ fun insert(cr: ContentResolver, relationships: Collection) { val insertItems = ArraySet() - relationships.forEach { - if (it._id > 0) { - val where = Expression.equals(CachedRelationships._ID, it._id).sql + relationships.forEach { parcelableRelationship -> + if (parcelableRelationship._id > 0) { + val where = Expression.equals(CachedRelationships._ID, parcelableRelationship._id).sql cr.updateItems(CachedRelationships.CONTENT_URI, CachedRelationships.COLUMNS, where, null, ParcelableRelationship::class.java) { return@updateItems it } } else { - insertItems.add(it) + insertItems.add(parcelableRelationship) } } cr.bulkInsert(CachedRelationships.CONTENT_URI, insertItems, ParcelableRelationship::class.java) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/preference/ColorPickerPreference.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/preference/ColorPickerPreference.kt index fe46be5ae..5ecbe1327 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/preference/ColorPickerPreference.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/preference/ColorPickerPreference.kt @@ -81,7 +81,7 @@ class ColorPickerPreference(context: Context, attrs: AttributeSet? = null) : override fun displayDialog(fragment: PreferenceFragmentCompat) { val df = ColorPickerPreferenceDialogFragment.newInstance(key) df.setTargetFragment(fragment, 0) - fragment.fragmentManager?.let { df.show(it, key) } + fragment.parentFragmentManager.let { df.show(it, key) } } override fun onBindViewHolder(holder: PreferenceViewHolder) { diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/preference/DefaultAPIPreference.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/preference/DefaultAPIPreference.kt index d4076d7a2..3171593f4 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/preference/DefaultAPIPreference.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/preference/DefaultAPIPreference.kt @@ -35,7 +35,7 @@ class DefaultAPIPreference( override fun displayDialog(fragment: PreferenceFragmentCompat) { val df = APIEditorDialogFragment() df.setTargetFragment(fragment, 0) - fragment.fragmentManager?.let { df.show(it, key) } + fragment.parentFragmentManager.let { df.show(it, key) } } } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/preference/KeyboardShortcutPreference.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/preference/KeyboardShortcutPreference.kt index 7305098ac..854a7f93c 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/preference/KeyboardShortcutPreference.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/preference/KeyboardShortcutPreference.kt @@ -72,7 +72,7 @@ class KeyboardShortcutPreference(context: Context, attrs: AttributeSet? = null) override fun displayDialog(fragment: PreferenceFragmentCompat) { val df = KeyboardShortcutDialogFragment.newInstance(action) df.setTargetFragment(fragment, 0) - fragment.fragmentManager?.let { df.show(it, action) } + fragment.parentFragmentManager.let { df.show(it, action) } } class KeyboardShortcutDialogFragment : ThemedPreferenceDialogFragmentCompat(), DialogInterface.OnKeyListener { diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/preference/RandomizeAccountNamePreference.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/preference/RandomizeAccountNamePreference.kt index 52acc7b12..58bbc1e12 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/preference/RandomizeAccountNamePreference.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/preference/RandomizeAccountNamePreference.kt @@ -58,7 +58,7 @@ class RandomizeAccountNamePreference @JvmOverloads constructor( override fun displayDialog(fragment: PreferenceFragmentCompat) { val df = RenameAccountsConfirmDialogFragment.newInstance(key, getPersistedBoolean(false)) df.setTargetFragment(fragment, 0) - fragment.fragmentManager?.let { df.show(it, key) } + fragment.parentFragmentManager.let { df.show(it, key) } } class RenameAccountsConfirmDialogFragment : PreferenceDialogFragmentCompat() { diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/preference/ThemedEditTextPreference.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/preference/ThemedEditTextPreference.kt index 7d2421e4d..d880e20ab 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/preference/ThemedEditTextPreference.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/preference/ThemedEditTextPreference.kt @@ -36,6 +36,6 @@ class ThemedEditTextPreference(context: Context, attrs: AttributeSet? = null) : override fun displayDialog(fragment: PreferenceFragmentCompat) { val df = ThemedEditTextPreferenceDialogFragmentCompat.newInstance(key) df.setTargetFragment(fragment, 0) - fragment.fragmentManager?.let { df.show(it, key) } + fragment.parentFragmentManager.let { df.show(it, key) } } } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/preference/ThemedListPreference.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/preference/ThemedListPreference.kt index d2972f115..02375ad20 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/preference/ThemedListPreference.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/preference/ThemedListPreference.kt @@ -17,6 +17,6 @@ open class ThemedListPreference(context: Context, attrs: AttributeSet? = null) : override fun displayDialog(fragment: PreferenceFragmentCompat) { val df = ThemedListPreferenceDialogFragmentCompat.newInstance(key) df.setTargetFragment(fragment, 0) - fragment.fragmentManager?.let { df.show(it, key) } + fragment.parentFragmentManager.let { df.show(it, key) } } } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/task/twitter/GetActivitiesAboutMeTask.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/task/twitter/GetActivitiesAboutMeTask.kt index 41901ef6a..8224642ed 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/task/twitter/GetActivitiesAboutMeTask.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/task/twitter/GetActivitiesAboutMeTask.kt @@ -123,8 +123,8 @@ class GetActivitiesAboutMeTask(context: Context) : GetActivitiesTask(context) { } return GetTimelineResult(account, activities, activities.flatMap { it.sources?.toList().orEmpty() - }, timeline.flatMap { - it.entities?.hashtags?.map { it.text }.orEmpty() + }, timeline.flatMap { status -> + status.entities?.hashtags?.map { it.text }.orEmpty() }) } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/task/twitter/UpdateStatusTask.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/task/twitter/UpdateStatusTask.kt index ad4f5f431..0c2395322 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/task/twitter/UpdateStatusTask.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/task/twitter/UpdateStatusTask.kt @@ -687,7 +687,27 @@ class UpdateStatusTask( val ids: Array, val deleteOnSuccess: List, val deleteAlways: List - ) + ) { + override fun equals(other: Any?): Boolean { + if (this === other) return true + if (javaClass != other?.javaClass) return false + + other as SharedMediaUploadResult + + if (!ids.contentEquals(other.ids)) return false + if (deleteOnSuccess != other.deleteOnSuccess) return false + if (deleteAlways != other.deleteAlways) return false + + return true + } + + override fun hashCode(): Int { + var result = ids.contentHashCode() + result = 31 * result + deleteOnSuccess.hashCode() + result = 31 * result + deleteAlways.hashCode() + return result + } + } companion object { @@ -914,7 +934,7 @@ class UpdateStatusTask( return null } - if (imageLimit == null || (imageLimit.checkGeomentry(o.outWidth, o.outHeight) + if (imageLimit == null || (imageLimit.checkGeometry(o.outWidth, o.outHeight) && imageLimit.checkSize(imageSize, chucked))) return null o.inSampleSize = o.calculateInSampleSize(imageLimit.maxWidth, imageLimit.maxHeight) o.inJustDecodeBounds = false @@ -1092,7 +1112,7 @@ class UpdateStatusTask( context.contentResolver.delete(Drafts.CONTENT_URI, where, null) } - fun AccountExtras.ImageLimit.checkGeomentry(width: Int, height: Int): Boolean { + fun AccountExtras.ImageLimit.checkGeometry(width: Int, height: Int): Boolean { if (this.maxWidth <= 0 || this.maxHeight <= 0) return true return (width <= this.maxWidth && height <= this.maxHeight) || (height <= this.maxWidth && width <= this.maxHeight) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/AsyncTwitterWrapper.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/AsyncTwitterWrapper.kt index 2d28a6756..cdbfe405a 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/AsyncTwitterWrapper.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/AsyncTwitterWrapper.kt @@ -360,10 +360,6 @@ class AsyncTwitterWrapper( } override fun onException(callback: Any?, exception: MicroBlogException) { - if (exception !is MicroBlogException) { - Analyzer.logException(exception) - return - } DebugLog.w(TwidereConstants.LOGTAG, "Unable to update friendship", exception) } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/DataStoreUtils.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/DataStoreUtils.kt index e4f9f09fe..1550ea5ea 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/DataStoreUtils.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/DataStoreUtils.kt @@ -242,7 +242,7 @@ object DataStoreUtils { val (where, whereArgs) = getIdsWhere(isOfficial) getNewestActivityMaxSortPositions(context, uri, keys, where, whereArgs) }, { arr1, arr2 -> - LongArray(accountKeys.size) { arr1.elementAtOrNull(it)?.takeIf { it > 0 } ?: arr2.elementAtOrNull(it) ?: 0 } + LongArray(accountKeys.size) { array -> arr1.elementAtOrNull(array)?.takeIf { it > 0 } ?: arr2.elementAtOrNull(array) ?: 0 } }, accountKeys) } @@ -259,7 +259,7 @@ object DataStoreUtils { val (where, whereArgs) = getIdsWhere(isOfficial) getOldestActivityMaxSortPositions(context, uri, keys, where, whereArgs) }, { arr1, arr2 -> - LongArray(accountKeys.size) { arr1.elementAtOrNull(it)?.takeIf { it > 0 } ?: arr2.elementAtOrNull(it) ?: 0 } + LongArray(accountKeys.size) { array -> arr1.elementAtOrNull(array)?.takeIf { it > 0 } ?: arr2.elementAtOrNull(array) ?: 0 } }, accountKeys) } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/IntentUtils.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/IntentUtils.kt index 697669e94..9a55dc1a8 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/IntentUtils.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/IntentUtils.kt @@ -187,7 +187,7 @@ object IntentUtils { intent.data = Uri.parse("${uri.scheme}://") return intent.resolveActivity(context.packageManager)?.takeIf { - it.className != null && it.packageName != "android" + it.packageName != "android" }?.packageName } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/gifshare/GifShareProvider.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/gifshare/GifShareProvider.kt index 91716483a..57e6edfed 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/gifshare/GifShareProvider.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/gifshare/GifShareProvider.kt @@ -42,7 +42,7 @@ interface GifShareProvider { fun newFactory(): Factory = ServiceLoader.load(Factory::class.java)?.firstOrNull() ?: NullFactory private object NullFactory : Factory { - override fun newInstance(context: Context) = null + override fun newInstance(context: Context): Nothing? = null } } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/glide/RoundedRectTransformation.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/glide/RoundedRectTransformation.kt index e4be99d63..936ef97bf 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/glide/RoundedRectTransformation.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/glide/RoundedRectTransformation.kt @@ -71,8 +71,8 @@ class RoundedRectTransformation( return "RoundedRectTransformation(radius=$radius, radiusPercent=$radius)" } - override fun equals(o: Any?): Boolean { - return o is RoundedRectTransformation + override fun equals(other: Any?): Boolean { + return other is RoundedRectTransformation } override fun hashCode(): Int { diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/glide/TwidereGlideModule.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/glide/TwidereGlideModule.kt index ed9865db4..208ca55d5 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/glide/TwidereGlideModule.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/glide/TwidereGlideModule.kt @@ -24,6 +24,7 @@ import android.os.Build import com.bumptech.glide.Glide import com.bumptech.glide.GlideBuilder import com.bumptech.glide.Registry +import com.bumptech.glide.annotation.GlideModule import com.bumptech.glide.integration.okhttp3.OkHttpUrlLoader import com.bumptech.glide.load.model.GlideUrl import com.bumptech.glide.module.AppGlideModule @@ -39,7 +40,7 @@ import org.mariotaku.twidere.util.media.ThumborWrapper import org.mariotaku.twidere.util.okhttp.ModifyRequestInterceptor import java.io.InputStream -@com.bumptech.glide.annotation.GlideModule +@GlideModule class TwidereGlideModule : AppGlideModule() { override fun applyOptions(context: Context, builder: GlideBuilder) { // Do nothing. diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/media/MediaPreloader.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/media/MediaPreloader.kt index 24c46e5bd..3d5b4f06e 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/media/MediaPreloader.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/media/MediaPreloader.kt @@ -70,12 +70,12 @@ class MediaPreloader(val context: Context) { } private fun preLoadProfileImage(status: ParcelableStatus) { - Glide.with(context).loadProfileImage(context, status, 0).into(Target.SIZE_ORIGINAL, + Glide.with(context).loadProfileImage(context, status, 0).submit(Target.SIZE_ORIGINAL, Target.SIZE_ORIGINAL) } private fun preloadPreviewImage(url: String?) { - Glide.with(context).load(url).into(Target.SIZE_ORIGINAL, + Glide.with(context).load(url).submit(Target.SIZE_ORIGINAL, Target.SIZE_ORIGINAL) } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/net/SystemDnsFetcher.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/net/SystemDnsFetcher.kt index a84452bd5..e3998a003 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/net/SystemDnsFetcher.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/net/SystemDnsFetcher.kt @@ -42,8 +42,8 @@ object SystemDnsFetcher { @SuppressLint("PrivateApi") open fun get(context: Context): List? { try { - val SystemProperties = Class.forName("android.os.SystemProperties") - val method = SystemProperties.getMethod("get", String::class.java) + val systemProperties = Class.forName("android.os.SystemProperties") + val method = systemProperties.getMethod("get", String::class.java) val netdns = arrayOf("net.dns1", "net.dns2", "net.dns3", "net.dns4") return netdns.mapNotNull { key -> return@mapNotNull method(null, key) as? String diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/schedule/StatusScheduleProvider.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/schedule/StatusScheduleProvider.kt index 3ed434627..e55fd686f 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/schedule/StatusScheduleProvider.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/schedule/StatusScheduleProvider.kt @@ -64,7 +64,7 @@ interface StatusScheduleProvider { } private object NullFactory : Factory { - override fun newInstance(context: Context) = null + override fun newInstance(context: Context): Nothing? = null override fun parseInfo(json: String): ScheduleInfo? = null diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/sync/TimelineSyncManager.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/sync/TimelineSyncManager.kt index 52ab6d9eb..2660ae2fb 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/sync/TimelineSyncManager.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/sync/TimelineSyncManager.kt @@ -90,7 +90,7 @@ abstract class TimelineSyncManager(val context: Context) { } object DummyFactory : Factory() { - override fun create(context: Context) = null + override fun create(context: Context): Nothing? = null } companion object { diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/text/TwitterValidator.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/text/TwitterValidator.kt index 6d400b437..3da636e7c 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/text/TwitterValidator.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/text/TwitterValidator.kt @@ -22,6 +22,7 @@ package org.mariotaku.twidere.util.text import com.twitter.twittertext.Extractor import com.twitter.twittertext.Validator import java.text.Normalizer +import java.util.* object TwitterValidator : Validator() { @@ -54,7 +55,7 @@ object TwitterValidator : Validator() { for (urlEntity in extractor.extractURLsWithIndices(normalized)) { length += urlEntity.start - urlEntity.end - length += if (urlEntity.value.toLowerCase().startsWith("https://")) shortUrlLengthHttps else shortUrlLength + length += if (urlEntity.value.toLowerCase(Locale.ROOT).startsWith("https://")) shortUrlLengthHttps else shortUrlLength } return length diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/view/IconActionView.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/view/IconActionView.kt index f2615ed94..2fdafaa1e 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/view/IconActionView.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/view/IconActionView.kt @@ -23,7 +23,7 @@ open class IconActionView( context: Context, attrs: AttributeSet? = null ) : AppCompatImageView(context, attrs), IIconActionButton { - override var defaultColor: Int = 0 + final override var defaultColor: Int = 0 @ColorInt get() { if (field == 0) { @@ -40,7 +40,7 @@ open class IconActionView( updateColorFilter() } - override var activatedColor: Int = 0 + final override var activatedColor: Int = 0 @ColorInt get() { if (field != 0) return field @@ -51,7 +51,7 @@ open class IconActionView( updateColorFilter() } - override var disabledColor: Int = 0 + final override var disabledColor: Int = 0 @ColorInt get() { if (field != 0) return field diff --git a/twidere/src/main/kotlin/org/mariotaku/yandex/YandexAPIFactory.kt b/twidere/src/main/kotlin/org/mariotaku/yandex/YandexAPIFactory.kt index 5d9d6a4f7..2d05e5d37 100644 --- a/twidere/src/main/kotlin/org/mariotaku/yandex/YandexAPIFactory.kt +++ b/twidere/src/main/kotlin/org/mariotaku/yandex/YandexAPIFactory.kt @@ -15,7 +15,7 @@ class YandexAPIFactory(apiKey: String, endpoint: String) { init { factory.setEndpoint(Endpoint(endpoint)) - factory.setExceptionFactory { cause, request, response -> + factory.setExceptionFactory { cause, _, _ -> cause?.let { YandexException(it) } ?: YandexException() } diff --git a/twidere/src/main/res/layout/header_message_conversation_info_button_space.xml b/twidere/src/main/res/layout/header_message_conversation_info_button_space.xml index 60750f6e4..2785514c6 100644 --- a/twidere/src/main/res/layout/header_message_conversation_info_button_space.xml +++ b/twidere/src/main/res/layout/header_message_conversation_info_button_space.xml @@ -29,7 +29,7 @@ app:cardPreventCornerOverlap="false" app:cardUseCompatPadding="false"> - \ No newline at end of file From f7cea5029a0cd4461a3b58255b52846608029347 Mon Sep 17 00:00:00 2001 From: TacoTheDank Date: Sun, 28 Jun 2020 17:27:50 -0400 Subject: [PATCH 06/29] Move lint.xml to lintOptions --- lint.xml | 25 ------------------------- twidere/build.gradle | 2 +- 2 files changed, 1 insertion(+), 26 deletions(-) delete mode 100644 lint.xml diff --git a/lint.xml b/lint.xml deleted file mode 100644 index 650f7796d..000000000 --- a/lint.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/twidere/build.gradle b/twidere/build.gradle index b4d61c900..dbc0fef5a 100644 --- a/twidere/build.gradle +++ b/twidere/build.gradle @@ -127,7 +127,7 @@ android { lintOptions { checkReleaseBuilds false abortOnError false - lintConfig rootProject.file('lint.xml') + disable 'MissingTranslation', 'PluralsCandidate' } packagingOptions { From 5a3f881a5263e50d91cbd3a4fff64e995cc8bed7 Mon Sep 17 00:00:00 2001 From: TacoTheDank Date: Sun, 28 Jun 2020 19:25:05 -0400 Subject: [PATCH 07/29] Refer to commons-lang3 where unnecessary in local code --- twidere/build.gradle | 3 +- .../adapter/MessagesConversationAdapter.kt | 4 +- .../twidere/app/TwidereApplication.kt | 12 +- .../twidere/extension/CalendarExtensions.kt | 31 -- .../extension/model/api/StatusExtensions.kt | 4 +- .../mariotaku/twidere/util/EntityArrays.kt | 393 ------------------ .../twidere/util/HtmlEscapeHelper.kt | 9 +- .../twidere/util/concurrent/ConstantFuture.kt | 38 -- 8 files changed, 17 insertions(+), 477 deletions(-) delete mode 100644 twidere/src/main/kotlin/org/mariotaku/twidere/extension/CalendarExtensions.kt delete mode 100644 twidere/src/main/kotlin/org/mariotaku/twidere/util/EntityArrays.kt delete mode 100644 twidere/src/main/kotlin/org/mariotaku/twidere/util/concurrent/ConstantFuture.kt diff --git a/twidere/build.gradle b/twidere/build.gradle index dbc0fef5a..7d7580504 100644 --- a/twidere/build.gradle +++ b/twidere/build.gradle @@ -227,6 +227,7 @@ dependencies { implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.15' implementation 'com.sprylab.android.texturevideoview:texturevideoview:1.2.1' implementation 'com.squareup:pollexor:2.0.4' + implementation 'org.apache.commons:commons-lang3:3.10' implementation 'org.apache.commons:commons-text:1.8' implementation "org.apache.james:apache-mime4j-core:${libVersions['Mime4J']}" implementation "org.apache.james:apache-mime4j-storage:${libVersions['Mime4J']}" @@ -327,4 +328,4 @@ if (enableGoogleVariant) { // START Non-FOSS component apply plugin: 'com.google.gms.google-services' // END Non-FOSS component -} \ No newline at end of file +} diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/MessagesConversationAdapter.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/MessagesConversationAdapter.kt index 3f7792b87..ad90f2e6c 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/MessagesConversationAdapter.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/MessagesConversationAdapter.kt @@ -27,6 +27,7 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import com.bumptech.glide.RequestManager +import org.apache.commons.lang3.time.DateUtils import org.mariotaku.chameleon.Chameleon import org.mariotaku.chameleon.ChameleonUtils import org.mariotaku.kpreferences.get @@ -39,7 +40,6 @@ import org.mariotaku.twidere.constant.linkHighlightOptionKey import org.mariotaku.twidere.constant.mediaPreviewStyleKey import org.mariotaku.twidere.constant.nameFirstKey import org.mariotaku.twidere.exception.UnsupportedCountIndexException -import org.mariotaku.twidere.extension.isSameDay import org.mariotaku.twidere.extension.model.timestamp import org.mariotaku.twidere.model.* import org.mariotaku.twidere.model.ParcelableMessage.MessageType @@ -137,7 +137,7 @@ class MessagesConversationAdapter( + itemCounts[ITEM_START_MESSAGE] - 1) { calendars.first.timeInMillis = getMessageTimestamp(position + 1) calendars.second.timeInMillis = message.timestamp - showDate = !calendars.first.isSameDay(calendars.second) + showDate = !DateUtils.isSameDay(calendars.first, calendars.second) } (holder as AbsMessageViewHolder).display(message, showDate) } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/app/TwidereApplication.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/app/TwidereApplication.kt index 142cd7307..dae74fce7 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/app/TwidereApplication.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/app/TwidereApplication.kt @@ -1,18 +1,18 @@ /* * Twidere - Twitter client for Android - * + * * Copyright (C) 2012-2014 Mariotaku Lee - * + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -36,6 +36,7 @@ import androidx.multidex.MultiDex import com.bumptech.glide.Glide import nl.komponents.kovenant.task import okhttp3.Dns +import org.apache.commons.lang3.concurrent.ConcurrentUtils import org.mariotaku.abstask.library.TaskStarter import org.mariotaku.commons.logansquare.LoganSquareMapperFinder import org.mariotaku.kpreferences.KPreferences @@ -59,7 +60,6 @@ import org.mariotaku.twidere.extension.setLocale import org.mariotaku.twidere.model.DefaultFeatures import org.mariotaku.twidere.receiver.ConnectivityStateReceiver import org.mariotaku.twidere.util.* -import org.mariotaku.twidere.util.concurrent.ConstantFuture import org.mariotaku.twidere.util.content.TwidereSQLiteOpenHelper import org.mariotaku.twidere.util.dagger.ApplicationModule import org.mariotaku.twidere.util.dagger.GeneralComponent @@ -320,7 +320,7 @@ class TwidereApplication : Application(), OnSharedPreferenceChangeListener { LoganSquareMapperFinder.setDefaultExecutor(object : LoganSquareMapperFinder.FutureExecutor { override fun submit(callable: Callable): Future { if (Looper.getMainLooper().isCurrentThreadCompat) { - return ConstantFuture(callable.call()) + return ConcurrentUtils.constantFuture(callable.call()) } return executor.submit(callable) } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/CalendarExtensions.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/CalendarExtensions.kt deleted file mode 100644 index 6f5138f53..000000000 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/CalendarExtensions.kt +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Twidere - Twitter client for Android - * - * Copyright (C) 2012-2017 Mariotaku Lee - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package org.mariotaku.twidere.extension - -import java.util.* - -/** - * Created by mariotaku on 2017/9/25. - */ -fun Calendar.isSameDay(that: Calendar): Boolean { - return this[Calendar.ERA] == that[Calendar.ERA] && - this[Calendar.YEAR] == that[Calendar.YEAR] && - this[Calendar.DAY_OF_YEAR] == that[Calendar.DAY_OF_YEAR] -} \ No newline at end of file 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 d16def41d..d399bef71 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 @@ -21,6 +21,7 @@ package org.mariotaku.twidere.extension.model.api import android.text.Spanned import android.text.style.URLSpan +import org.apache.commons.text.translate.EntityArrays import org.apache.commons.text.translate.LookupTranslator import org.mariotaku.commons.text.CodePointArray import org.mariotaku.ktextension.isNotNullOrEmpty @@ -40,7 +41,6 @@ import org.mariotaku.twidere.model.util.ParcelableLocationUtils import org.mariotaku.twidere.model.util.ParcelableMediaUtils import org.mariotaku.twidere.text.AcctMentionSpan import org.mariotaku.twidere.text.HashtagSpan -import org.mariotaku.twidere.util.EntityArrays import org.mariotaku.twidere.util.HtmlBuilder import org.mariotaku.twidere.util.HtmlSpanBuilder import org.mariotaku.twidere.util.InternalTwitterContentUtils @@ -421,4 +421,4 @@ class StatusTextWithIndices { var text: String? = null var spans: Array? = null var range: IntArray? = null -} \ No newline at end of file +} diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/EntityArrays.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/EntityArrays.kt deleted file mode 100644 index 97327a24f..000000000 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/EntityArrays.kt +++ /dev/null @@ -1,393 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.mariotaku.twidere.util - -import java.util.* - -/** - * Class holding various entity data for HTML and XML - generally for use with - * the LookupTranslator. - * All Maps are generated using `java.util.Collections.unmodifiableMap()`. - * - * @since 1.0 - */ -object EntityArrays { - - /** - * A Map<CharSequence, CharSequence> to to escape - * [ISO-8859-1](https://secure.wikimedia.org/wikipedia/en/wiki/ISO/IEC_8859-1) - * characters to their named HTML 3.x equivalents. - */ - val ISO8859_1_ESCAPE: Map = mapOf( - "\u00A0" to " ", // non-breaking space - "\u00A1" to "¡", // inverted exclamation mark - "\u00A2" to "¢", // cent sign - "\u00A3" to "£", // pound sign - "\u00A4" to "¤", // currency sign - "\u00A5" to "¥", // yen sign = yuan sign - "\u00A6" to "¦", // broken bar = broken vertical bar - "\u00A7" to "§", // section sign - "\u00A8" to "¨", // diaeresis = spacing diaeresis - "\u00A9" to "©", // © - copyright sign - "\u00AA" to "ª", // feminine ordinal indicator - "\u00AB" to "«", // left-pointing double angle quotation mark = left pointing guillemet - "\u00AC" to "¬", // not sign - "\u00AD" to "­", // soft hyphen = discretionary hyphen - "\u00AE" to "®", // ® - registered trademark sign - "\u00AF" to "¯", // macron = spacing macron = overline = APL overbar - "\u00B0" to "°", // degree sign - "\u00B1" to "±", // plus-minus sign = plus-or-minus sign - "\u00B2" to "²", // superscript two = superscript digit two = squared - "\u00B3" to "³", // superscript three = superscript digit three = cubed - "\u00B4" to "´", // acute accent = spacing acute - "\u00B5" to "µ", // micro sign - "\u00B6" to "¶", // pilcrow sign = paragraph sign - "\u00B7" to "·", // middle dot = Georgian comma = Greek middle dot - "\u00B8" to "¸", // cedilla = spacing cedilla - "\u00B9" to "¹", // superscript one = superscript digit one - "\u00BA" to "º", // masculine ordinal indicator - "\u00BB" to "»", // right-pointing double angle quotation mark = right pointing guillemet - "\u00BC" to "¼", // vulgar fraction one quarter = fraction one quarter - "\u00BD" to "½", // vulgar fraction one half = fraction one half - "\u00BE" to "¾", // vulgar fraction three quarters = fraction three quarters - "\u00BF" to "¿", // inverted question mark = turned question mark - "\u00C0" to "À", // À - uppercase A, grave accent - "\u00C1" to "Á", // Á - uppercase A, acute accent - "\u00C2" to "Â", //  - uppercase A, circumflex accent - "\u00C3" to "Ã", // à - uppercase A, tilde - "\u00C4" to "Ä", // Ä - uppercase A, umlaut - "\u00C5" to "Å", // Å - uppercase A, ring - "\u00C6" to "Æ", // Æ - uppercase AE - "\u00C7" to "Ç", // Ç - uppercase C, cedilla - "\u00C8" to "È", // È - uppercase E, grave accent - "\u00C9" to "É", // É - uppercase E, acute accent - "\u00CA" to "Ê", // Ê - uppercase E, circumflex accent - "\u00CB" to "Ë", // Ë - uppercase E, umlaut - "\u00CC" to "Ì", // Ì - uppercase I, grave accent - "\u00CD" to "Í", // Í - uppercase I, acute accent - "\u00CE" to "Î", // Î - uppercase I, circumflex accent - "\u00CF" to "Ï", // Ï - uppercase I, umlaut - "\u00D0" to "Ð", // Ð - uppercase Eth, Icelandic - "\u00D1" to "Ñ", // Ñ - uppercase N, tilde - "\u00D2" to "Ò", // Ò - uppercase O, grave accent - "\u00D3" to "Ó", // Ó - uppercase O, acute accent - "\u00D4" to "Ô", // Ô - uppercase O, circumflex accent - "\u00D5" to "Õ", // Õ - uppercase O, tilde - "\u00D6" to "Ö", // Ö - uppercase O, umlaut - "\u00D7" to "×", // multiplication sign - "\u00D8" to "Ø", // Ø - uppercase O, slash - "\u00D9" to "Ù", // Ù - uppercase U, grave accent - "\u00DA" to "Ú", // Ú - uppercase U, acute accent - "\u00DB" to "Û", // Û - uppercase U, circumflex accent - "\u00DC" to "Ü", // Ü - uppercase U, umlaut - "\u00DD" to "Ý", // Ý - uppercase Y, acute accent - "\u00DE" to "Þ", // Þ - uppercase THORN, Icelandic - "\u00DF" to "ß", // ß - lowercase sharps, German - "\u00E0" to "à", // à - lowercase a, grave accent - "\u00E1" to "á", // á - lowercase a, acute accent - "\u00E2" to "â", // â - lowercase a, circumflex accent - "\u00E3" to "ã", // ã - lowercase a, tilde - "\u00E4" to "ä", // ä - lowercase a, umlaut - "\u00E5" to "å", // å - lowercase a, ring - "\u00E6" to "æ", // æ - lowercase ae - "\u00E7" to "ç", // ç - lowercase c, cedilla - "\u00E8" to "è", // è - lowercase e, grave accent - "\u00E9" to "é", // é - lowercase e, acute accent - "\u00EA" to "ê", // ê - lowercase e, circumflex accent - "\u00EB" to "ë", // ë - lowercase e, umlaut - "\u00EC" to "ì", // ì - lowercase i, grave accent - "\u00ED" to "í", // í - lowercase i, acute accent - "\u00EE" to "î", // î - lowercase i, circumflex accent - "\u00EF" to "ï", // ï - lowercase i, umlaut - "\u00F0" to "ð", // ð - lowercase eth, Icelandic - "\u00F1" to "ñ", // ñ - lowercase n, tilde - "\u00F2" to "ò", // ò - lowercase o, grave accent - "\u00F3" to "ó", // ó - lowercase o, acute accent - "\u00F4" to "ô", // ô - lowercase o, circumflex accent - "\u00F5" to "õ", // õ - lowercase o, tilde - "\u00F6" to "ö", // ö - lowercase o, umlaut - "\u00F7" to "÷", // division sign - "\u00F8" to "ø", // ø - lowercase o, slash - "\u00F9" to "ù", // ù - lowercase u, grave accent - "\u00FA" to "ú", // ú - lowercase u, acute accent - "\u00FB" to "û", // û - lowercase u, circumflex accent - "\u00FC" to "ü", // ü - lowercase u, umlaut - "\u00FD" to "ý", // ý - lowercase y, acute accent - "\u00FE" to "þ", // þ - lowercase thorn, Icelandic - "\u00FF" to "ÿ" // ÿ - lowercase y, umlaut - ) - - /** - * Reverse of [.ISO8859_1_ESCAPE] for unescaping purposes. - */ - val ISO8859_1_UNESCAPE: Map = ISO8859_1_ESCAPE.invert() - - /** - * A Map<CharSequence, CharSequence> to escape additional - * [character entity references](http://www.w3.org/TR/REC-html40/sgml/entities.html). - * Note that this must be used with [.ISO8859_1_ESCAPE] to get the full list of - * HTML 4.0 character entities. - */ - val HTML40_EXTENDED_ESCAPE: Map = mapOf( - // - "\u0192" to "ƒ", // latin small f with hook = function= florin, U+0192 ISOtech --> - // - "\u0391" to "Α", // greek capital letter alpha, U+0391 --> - "\u0392" to "Β", // greek capital letter beta, U+0392 --> - "\u0393" to "Γ", // greek capital letter gamma,U+0393 ISOgrk3 --> - "\u0394" to "Δ", // greek capital letter delta,U+0394 ISOgrk3 --> - "\u0395" to "Ε", // greek capital letter epsilon, U+0395 --> - "\u0396" to "Ζ", // greek capital letter zeta, U+0396 --> - "\u0397" to "Η", // greek capital letter eta, U+0397 --> - "\u0398" to "Θ", // greek capital letter theta,U+0398 ISOgrk3 --> - "\u0399" to "Ι", // greek capital letter iota, U+0399 --> - "\u039A" to "Κ", // greek capital letter kappa, U+039A --> - "\u039B" to "Λ", // greek capital letter lambda,U+039B ISOgrk3 --> - "\u039C" to "Μ", // greek capital letter mu, U+039C --> - "\u039D" to "Ν", // greek capital letter nu, U+039D --> - "\u039E" to "Ξ", // greek capital letter xi, U+039E ISOgrk3 --> - "\u039F" to "Ο", // greek capital letter omicron, U+039F --> - "\u03A0" to "Π", // greek capital letter pi, U+03A0 ISOgrk3 --> - "\u03A1" to "Ρ", // greek capital letter rho, U+03A1 --> - // - "\u03A3" to "Σ", // greek capital letter sigma,U+03A3 ISOgrk3 --> - "\u03A4" to "Τ", // greek capital letter tau, U+03A4 --> - "\u03A5" to "Υ", // greek capital letter upsilon,U+03A5 ISOgrk3 --> - "\u03A6" to "Φ", // greek capital letter phi,U+03A6 ISOgrk3 --> - "\u03A7" to "Χ", // greek capital letter chi, U+03A7 --> - "\u03A8" to "Ψ", // greek capital letter psi,U+03A8 ISOgrk3 --> - "\u03A9" to "Ω", // greek capital letter omega,U+03A9 ISOgrk3 --> - "\u03B1" to "α", // greek small letter alpha,U+03B1 ISOgrk3 --> - "\u03B2" to "β", // greek small letter beta, U+03B2 ISOgrk3 --> - "\u03B3" to "γ", // greek small letter gamma,U+03B3 ISOgrk3 --> - "\u03B4" to "δ", // greek small letter delta,U+03B4 ISOgrk3 --> - "\u03B5" to "ε", // greek small letter epsilon,U+03B5 ISOgrk3 --> - "\u03B6" to "ζ", // greek small letter zeta, U+03B6 ISOgrk3 --> - "\u03B7" to "η", // greek small letter eta, U+03B7 ISOgrk3 --> - "\u03B8" to "θ", // greek small letter theta,U+03B8 ISOgrk3 --> - "\u03B9" to "ι", // greek small letter iota, U+03B9 ISOgrk3 --> - "\u03BA" to "κ", // greek small letter kappa,U+03BA ISOgrk3 --> - "\u03BB" to "λ", // greek small letter lambda,U+03BB ISOgrk3 --> - "\u03BC" to "μ", // greek small letter mu, U+03BC ISOgrk3 --> - "\u03BD" to "ν", // greek small letter nu, U+03BD ISOgrk3 --> - "\u03BE" to "ξ", // greek small letter xi, U+03BE ISOgrk3 --> - "\u03BF" to "ο", // greek small letter omicron, U+03BF NEW --> - "\u03C0" to "π", // greek small letter pi, U+03C0 ISOgrk3 --> - "\u03C1" to "ρ", // greek small letter rho, U+03C1 ISOgrk3 --> - "\u03C2" to "ς", // greek small letter final sigma,U+03C2 ISOgrk3 --> - "\u03C3" to "σ", // greek small letter sigma,U+03C3 ISOgrk3 --> - "\u03C4" to "τ", // greek small letter tau, U+03C4 ISOgrk3 --> - "\u03C5" to "υ", // greek small letter upsilon,U+03C5 ISOgrk3 --> - "\u03C6" to "φ", // greek small letter phi, U+03C6 ISOgrk3 --> - "\u03C7" to "χ", // greek small letter chi, U+03C7 ISOgrk3 --> - "\u03C8" to "ψ", // greek small letter psi, U+03C8 ISOgrk3 --> - "\u03C9" to "ω", // greek small letter omega,U+03C9 ISOgrk3 --> - "\u03D1" to "ϑ", // greek small letter theta symbol,U+03D1 NEW --> - "\u03D2" to "ϒ", // greek upsilon with hook symbol,U+03D2 NEW --> - "\u03D6" to "ϖ", // greek pi symbol, U+03D6 ISOgrk3 --> - // - "\u2022" to "•", // bullet = black small circle,U+2022 ISOpub --> - // - "\u2026" to "…", // horizontal ellipsis = three dot leader,U+2026 ISOpub --> - "\u2032" to "′", // prime = minutes = feet, U+2032 ISOtech --> - "\u2033" to "″", // double prime = seconds = inches,U+2033 ISOtech --> - "\u203E" to "‾", // overline = spacing overscore,U+203E NEW --> - "\u2044" to "⁄", // fraction slash, U+2044 NEW --> - // - "\u2118" to "℘", // script capital P = power set= Weierstrass p, U+2118 ISOamso --> - "\u2111" to "ℑ", // blackletter capital I = imaginary part,U+2111 ISOamso --> - "\u211C" to "ℜ", // blackletter capital R = real part symbol,U+211C ISOamso --> - "\u2122" to "™", // trade mark sign, U+2122 ISOnum --> - "\u2135" to "ℵ", // alef symbol = first transfinite cardinal,U+2135 NEW --> - // - // - "\u2190" to "←", // leftwards arrow, U+2190 ISOnum --> - "\u2191" to "↑", // upwards arrow, U+2191 ISOnum--> - "\u2192" to "→", // rightwards arrow, U+2192 ISOnum --> - "\u2193" to "↓", // downwards arrow, U+2193 ISOnum --> - "\u2194" to "↔", // left right arrow, U+2194 ISOamsa --> - "\u21B5" to "↵", // downwards arrow with corner leftwards= carriage return, U+21B5 NEW --> - "\u21D0" to "⇐", // leftwards double arrow, U+21D0 ISOtech --> - // - "\u21D1" to "⇑", // upwards double arrow, U+21D1 ISOamsa --> - "\u21D2" to "⇒", // rightwards double arrow,U+21D2 ISOtech --> - // - "\u21D3" to "⇓", // downwards double arrow, U+21D3 ISOamsa --> - "\u21D4" to "⇔", // left right double arrow,U+21D4 ISOamsa --> - // - "\u2200" to "∀", // for all, U+2200 ISOtech --> - "\u2202" to "∂", // partial differential, U+2202 ISOtech --> - "\u2203" to "∃", // there exists, U+2203 ISOtech --> - "\u2205" to "∅", // empty set = null set = diameter,U+2205 ISOamso --> - "\u2207" to "∇", // nabla = backward difference,U+2207 ISOtech --> - "\u2208" to "∈", // element of, U+2208 ISOtech --> - "\u2209" to "∉", // not an element of, U+2209 ISOtech --> - "\u220B" to "∋", // contains as member, U+220B ISOtech --> - // - "\u220F" to "∏", // n-ary product = product sign,U+220F ISOamsb --> - // - "\u2211" to "∑", // n-ary summation, U+2211 ISOamsb --> - // - "\u2212" to "−", // minus sign, U+2212 ISOtech --> - "\u2217" to "∗", // asterisk operator, U+2217 ISOtech --> - "\u221A" to "√", // square root = radical sign,U+221A ISOtech --> - "\u221D" to "∝", // proportional to, U+221D ISOtech --> - "\u221E" to "∞", // infinity, U+221E ISOtech --> - "\u2220" to "∠", // angle, U+2220 ISOamso --> - "\u2227" to "∧", // logical and = wedge, U+2227 ISOtech --> - "\u2228" to "∨", // logical or = vee, U+2228 ISOtech --> - "\u2229" to "∩", // intersection = cap, U+2229 ISOtech --> - "\u222A" to "∪", // union = cup, U+222A ISOtech --> - "\u222B" to "∫", // integral, U+222B ISOtech --> - "\u2234" to "∴", // therefore, U+2234 ISOtech --> - "\u223C" to "∼", // tilde operator = varies with = similar to,U+223C ISOtech --> - // - "\u2245" to "≅", // approximately equal to, U+2245 ISOtech --> - "\u2248" to "≈", // almost equal to = asymptotic to,U+2248 ISOamsr --> - "\u2260" to "≠", // not equal to, U+2260 ISOtech --> - "\u2261" to "≡", // identical to, U+2261 ISOtech --> - "\u2264" to "≤", // less-than or equal to, U+2264 ISOtech --> - "\u2265" to "≥", // greater-than or equal to,U+2265 ISOtech --> - "\u2282" to "⊂", // subset of, U+2282 ISOtech --> - "\u2283" to "⊃", // superset of, U+2283 ISOtech --> - // , - "\u2284" to "⊄", // not a subset of, U+2284 ISOamsn --> - "\u2286" to "⊆", // subset of or equal to, U+2286 ISOtech --> - "\u2287" to "⊇", // superset of or equal to,U+2287 ISOtech --> - "\u2295" to "⊕", // circled plus = direct sum,U+2295 ISOamsb --> - "\u2297" to "⊗", // circled times = vector product,U+2297 ISOamsb --> - "\u22A5" to "⊥", // up tack = orthogonal to = perpendicular,U+22A5 ISOtech --> - "\u22C5" to "⋅", // dot operator, U+22C5 ISOamsb --> - // - // - "\u2308" to "⌈", // left ceiling = apl upstile,U+2308 ISOamsc --> - "\u2309" to "⌉", // right ceiling, U+2309 ISOamsc --> - "\u230A" to "⌊", // left floor = apl downstile,U+230A ISOamsc --> - "\u230B" to "⌋", // right floor, U+230B ISOamsc --> - "\u2329" to "⟨", // left-pointing angle bracket = bra,U+2329 ISOtech --> - // - "\u232A" to "⟩", // right-pointing angle bracket = ket,U+232A ISOtech --> - // - // - "\u25CA" to "◊", // lozenge, U+25CA ISOpub --> - // - "\u2660" to "♠", // black spade suit, U+2660 ISOpub --> - // - "\u2663" to "♣", // black club suit = shamrock,U+2663 ISOpub --> - "\u2665" to "♥", // black heart suit = valentine,U+2665 ISOpub --> - "\u2666" to "♦", // black diamond suit, U+2666 ISOpub --> - - // - "\u0152" to "Œ", // -- latin capital ligature OE,U+0152 ISOlat2 --> - "\u0153" to "œ", // -- latin small ligature oe, U+0153 ISOlat2 --> - // - "\u0160" to "Š", // -- latin capital letter S with caron,U+0160 ISOlat2 --> - "\u0161" to "š", // -- latin small letter s with caron,U+0161 ISOlat2 --> - "\u0178" to "Ÿ", // -- latin capital letter Y with diaeresis,U+0178 ISOlat2 --> - // - "\u02C6" to "ˆ", // -- modifier letter circumflex accent,U+02C6 ISOpub --> - "\u02DC" to "˜", // small tilde, U+02DC ISOdia --> - // - "\u2002" to " ", // en space, U+2002 ISOpub --> - "\u2003" to " ", // em space, U+2003 ISOpub --> - "\u2009" to " ", // thin space, U+2009 ISOpub --> - "\u200C" to "‌", // zero width non-joiner,U+200C NEW RFC 2070 --> - "\u200D" to "‍", // zero width joiner, U+200D NEW RFC 2070 --> - "\u200E" to "‎", // left-to-right mark, U+200E NEW RFC 2070 --> - "\u200F" to "‏", // right-to-left mark, U+200F NEW RFC 2070 --> - "\u2013" to "–", // en dash, U+2013 ISOpub --> - "\u2014" to "—", // em dash, U+2014 ISOpub --> - "\u2018" to "‘", // left single quotation mark,U+2018 ISOnum --> - "\u2019" to "’", // right single quotation mark,U+2019 ISOnum --> - "\u201A" to "‚", // single low-9 quotation mark, U+201A NEW --> - "\u201C" to "“", // left double quotation mark,U+201C ISOnum --> - "\u201D" to "”", // right double quotation mark,U+201D ISOnum --> - "\u201E" to "„", // double low-9 quotation mark, U+201E NEW --> - "\u2020" to "†", // dagger, U+2020 ISOpub --> - "\u2021" to "‡", // double dagger, U+2021 ISOpub --> - "\u2030" to "‰", // per mille sign, U+2030 ISOtech --> - "\u2039" to "‹", // single left-pointing angle quotation mark,U+2039 ISO proposed --> - // - "\u203A" to "›", // single right-pointing angle quotation mark,U+203A ISO proposed --> - // - "\u20AC" to "€" // -- euro sign, U+20AC NEW --> - ) - - /** - * Reverse of [.HTML40_EXTENDED_ESCAPE] for unescaping purposes. - */ - val HTML40_EXTENDED_UNESCAPE: Map = HTML40_EXTENDED_ESCAPE.invert() - - /** - * A Map<CharSequence, CharSequence> to escape the basic XML and HTML - * character entities. - * - * Namely: `" & < >` - */ - val BASIC_ESCAPE: Map = mapOf( - "\"" to """, // " - double-quote - "&" to "&", // & - ampersand - "<" to "<", // < - less-than - ">" to ">" // > - greater-than - ) - - /** - * Reverse of [.BASIC_ESCAPE] for unescaping purposes. - */ - val BASIC_UNESCAPE: Map = BASIC_ESCAPE.invert() - - /** - * A Map<CharSequence, CharSequence> to escape the apostrophe character to - * its XML character entity. - */ - val APOS_ESCAPE: Map = mapOf( - "'" to "'" // XML apostrophe - ) - - /** - * Reverse of [.APOS_ESCAPE] for unescaping purposes. - */ - val APOS_UNESCAPE: Map = APOS_ESCAPE.invert() - - /** - * Used to invert an escape Map into an unescape Map. - * @param this@invert Map<String, String> to be inverted - * @return Map<String, String> inverted array - */ - private fun Map.invert(): Map { - val newMap = HashMap() - val it = entries.iterator() - while (it.hasNext()) { - val pair = it.next() - newMap[pair.value] = pair.key - } - return newMap - } - -} diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/HtmlEscapeHelper.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/HtmlEscapeHelper.kt index e884fd7d7..bb45c1e21 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/HtmlEscapeHelper.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/HtmlEscapeHelper.kt @@ -1,18 +1,18 @@ /* * Twidere - Twitter client for Android - * + * * Copyright (C) 2012-2014 Mariotaku Lee - * + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -21,6 +21,7 @@ package org.mariotaku.twidere.util import org.apache.commons.text.translate.AggregateTranslator import org.apache.commons.text.translate.CodePointTranslator +import org.apache.commons.text.translate.EntityArrays import org.apache.commons.text.translate.LookupTranslator import org.apache.commons.text.translate.NumericEntityUnescaper import java.io.IOException diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/concurrent/ConstantFuture.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/concurrent/ConstantFuture.kt deleted file mode 100644 index e9481b3e2..000000000 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/concurrent/ConstantFuture.kt +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Twidere - Twitter client for Android - * - * Copyright (C) 2012-2017 Mariotaku Lee - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package org.mariotaku.twidere.util.concurrent - -import java.util.concurrent.Future -import java.util.concurrent.TimeUnit - -/** - * Created by mariotaku on 2017/9/25. - */ -class ConstantFuture(private val value: V) : Future { - override fun isDone() = true - - override fun get() = value - - override fun get(time: Long, unit: TimeUnit?) = value - - override fun isCancelled() = false - - override fun cancel(mayInterruptIfRunning: Boolean) = false -} \ No newline at end of file From 1a833cdaa9226a705fa071911fc5191b278f35a3 Mon Sep 17 00:00:00 2001 From: TacoTheDank Date: Sun, 28 Jun 2020 19:53:12 -0400 Subject: [PATCH 08/29] Replace old local QrCodeGen with upstream library --- twidere/build.gradle | 1 + .../java/io/nayuki/qrcodegen/BitBuffer.java | 94 --- .../main/java/io/nayuki/qrcodegen/QrCode.java | 793 ------------------ .../java/io/nayuki/qrcodegen/QrSegment.java | 280 ------- .../io/nayuki/qrcodegen/package-info.java | 5 - .../mariotaku/twidere/util/qr/QrCodeData.kt | 2 +- 6 files changed, 2 insertions(+), 1173 deletions(-) delete mode 100755 twidere/src/main/java/io/nayuki/qrcodegen/BitBuffer.java delete mode 100755 twidere/src/main/java/io/nayuki/qrcodegen/QrCode.java delete mode 100755 twidere/src/main/java/io/nayuki/qrcodegen/QrSegment.java delete mode 100644 twidere/src/main/java/io/nayuki/qrcodegen/package-info.java diff --git a/twidere/build.gradle b/twidere/build.gradle index 7d7580504..56d261e18 100644 --- a/twidere/build.gradle +++ b/twidere/build.gradle @@ -253,6 +253,7 @@ dependencies { kapt "com.github.bumptech.glide:compiler:${libVersions['Glide']}" implementation 'jp.wasabeef:glide-transformations:4.1.0' implementation 'com.theartofdev.edmodo:android-image-cropper:2.8.0' + implementation 'io.nayuki:qrcodegen:1.6.0' /** Custom dependencies **/ diff --git a/twidere/src/main/java/io/nayuki/qrcodegen/BitBuffer.java b/twidere/src/main/java/io/nayuki/qrcodegen/BitBuffer.java deleted file mode 100755 index 0173ddce1..000000000 --- a/twidere/src/main/java/io/nayuki/qrcodegen/BitBuffer.java +++ /dev/null @@ -1,94 +0,0 @@ -/* - * QR Code generator library (Java) - * - * Copyright (c) Project Nayuki. (MIT License) - * https://www.nayuki.io/page/qr-code-generator-library - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - The Software is provided "as is", without warranty of any kind, express or - * implied, including but not limited to the warranties of merchantability, - * fitness for a particular purpose and noninfringement. In no event shall the - * authors or copyright holders be liable for any claim, damages or other - * liability, whether in an action of contract, tort or otherwise, arising from, - * out of or in connection with the Software or the use or other dealings in the - * Software. - */ - -package io.nayuki.qrcodegen; - -import androidx.annotation.NonNull; - -import java.util.Arrays; - - -/** - * An appendable sequence of bits. Bits are packed in big endian within a byte. - */ -final class BitBuffer { - - /*---- Fields ----*/ - - private byte[] data; - private int bitLength; - - - - /*---- Constructor ----*/ - - // Creates an empty bit buffer (length 0). - public BitBuffer() { - data = new byte[16]; - bitLength = 0; - } - - - - /*---- Methods ----*/ - - // Returns the number of bits in the buffer, which is a non-negative value. - public int bitLength() { - return bitLength; - } - - - // Returns a copy of all bytes, padding up to the nearest byte. - public byte[] getBytes() { - return Arrays.copyOf(data, (bitLength + 7) / 8); - } - - - // Appends the given number of bits of the given value to this sequence. - // If 0 <= len <= 31, then this requires 0 <= val < 2^len. - public void appendBits(int val, int len) { - if (len < 0 || len > 32 || len < 32 && (val >>> len) != 0) - throw new IllegalArgumentException("Value out of range"); - ensureCapacity(bitLength + len); - for (int i = len - 1; i >= 0; i--, bitLength++) // Append bit by bit - data[bitLength >>> 3] |= ((val >>> i) & 1) << (7 - (bitLength & 7)); - } - - - // Appends the data of the given segment to this bit buffer. - public void appendData(@NonNull QrSegment seg) { - ensureCapacity(bitLength + seg.bitLength); - for (int i = 0; i < seg.bitLength; i++, bitLength++) { // Append bit by bit - int bit = (seg.getByte(i >>> 3) >>> (7 - (i & 7))) & 1; - data[bitLength >>> 3] |= bit << (7 - (bitLength & 7)); - } - } - - - // Expands the buffer if necessary, so that it can hold at least the given bit length. - private void ensureCapacity(int newBitLen) { - while (data.length * 8 < newBitLen) - data = Arrays.copyOf(data, data.length * 2); - } - -} diff --git a/twidere/src/main/java/io/nayuki/qrcodegen/QrCode.java b/twidere/src/main/java/io/nayuki/qrcodegen/QrCode.java deleted file mode 100755 index 51c2799b0..000000000 --- a/twidere/src/main/java/io/nayuki/qrcodegen/QrCode.java +++ /dev/null @@ -1,793 +0,0 @@ -/* - * QR Code generator library (Java) - * - * Copyright (c) Project Nayuki. (MIT License) - * https://www.nayuki.io/page/qr-code-generator-library - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - The Software is provided "as is", without warranty of any kind, express or - * implied, including but not limited to the warranties of merchantability, - * fitness for a particular purpose and noninfringement. In no event shall the - * authors or copyright holders be liable for any claim, damages or other - * liability, whether in an action of contract, tort or otherwise, arising from, - * out of or in connection with the Software or the use or other dealings in the - * Software. - */ - -package io.nayuki.qrcodegen; - -import androidx.annotation.NonNull; - -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - - -/** - * Represents an immutable square grid of black and white cells for a QR Code symbol, and - * provides static functions to create a QR Code from user-supplied textual or binary data. - *

    This class covers the QR Code model 2 specification, supporting all versions (sizes) - * from 1 to 40, all 4 error correction levels, and only 3 character encoding modes.

    - */ -public final class QrCode { - - /*---- Public static factory functions ----*/ - - /** - * Returns a QR Code symbol representing the specified Unicode text string at the specified error correction level. - * As a conservative upper bound, this function is guaranteed to succeed for strings that have 738 or fewer Unicode - * code points (not UTF-16 code units). The smallest possible QR Code version is automatically chosen for the output. - * The ECC level of the result may be higher than the ecl argument if it can be done without increasing the version. - * @param text the text to be encoded, which can be any Unicode string - * @param ecl the error correction level to use (will be boosted) - * @return a QR Code representing the text - * @throws NullPointerException if the text or error correction level is {@code null} - * @throws IllegalArgumentException if the text fails to fit in the largest version QR Code, which means it is too long - */ - public static QrCode encodeText(@NonNull String text, @NonNull Ecc ecl) { - List segs = QrSegment.makeSegments(text); - return encodeSegments(segs, ecl); - } - - - /** - * Returns a QR Code symbol representing the specified binary data string at the specified error correction level. - * This function always encodes using the binary segment mode, not any text mode. The maximum number of - * bytes allowed is 2953. The smallest possible QR Code version is automatically chosen for the output. - * The ECC level of the result may be higher than the ecl argument if it can be done without increasing the version. - * @param data the binary data to encode - * @param ecl the error correction level to use (will be boosted) - * @return a QR Code representing the binary data - * @throws NullPointerException if the data or error correction level is {@code null} - * @throws IllegalArgumentException if the data fails to fit in the largest version QR Code, which means it is too long - */ - public static QrCode encodeBinary(@NonNull byte[] data, @NonNull Ecc ecl) { - QrSegment seg = QrSegment.makeBytes(data); - return encodeSegments(Collections.singletonList(seg), ecl); - } - - - /** - * Returns a QR Code symbol representing the specified data segments at the specified error correction - * level or higher. The smallest possible QR Code version is automatically chosen for the output. - *

    This function allows the user to create a custom sequence of segments that switches - * between modes (such as alphanumeric and binary) to encode text more efficiently. This - * function is considered to be lower level than simply encoding text or binary data.

    - * @param segs the segments to encode - * @param ecl the error correction level to use (will be boosted) - * @return a QR Code representing the segments - * @throws NullPointerException if the list of segments, a segment, or the error correction level is {@code null} - * @throws IllegalArgumentException if the data is too long to fit in the largest version QR Code at the ECL - */ - public static QrCode encodeSegments(List segs, Ecc ecl) { - return encodeSegments(segs, ecl, 1, 40, -1, true); - } - - - /** - * Returns a QR Code symbol representing the specified data segments with the specified encoding parameters. - * The smallest possible QR Code version within the specified range is automatically chosen for the output. - *

    This function allows the user to create a custom sequence of segments that switches - * between modes (such as alphanumeric and binary) to encode text more efficiently. - * This function is considered to be lower level than simply encoding text or binary data.

    - * @param segs the segments to encode - * @param ecl the error correction level to use (may be boosted) - * @param minVersion the minimum allowed version of the QR symbol (at least 1) - * @param maxVersion the maximum allowed version of the QR symbol (at most 40) - * @param mask the mask pattern to use, which is either -1 for automatic choice or from 0 to 7 for fixed choice - * @param boostEcl increases the error correction level if it can be done without increasing the version number - * @return a QR Code representing the segments - * @throws NullPointerException if the list of segments, a segment, or the error correction level is {@code null} - * @throws IllegalArgumentException if 1 ≤ minVersion ≤ maxVersion ≤ 40 is violated, or if mask - * < −1 or mask > 7, or if the data is too long to fit in a QR Code at maxVersion at the ECL - */ - public static QrCode encodeSegments(@NonNull List segs, @NonNull Ecc ecl, int minVersion, int maxVersion, int mask, boolean boostEcl) { - if (!(1 <= minVersion && minVersion <= maxVersion && maxVersion <= 40) || mask < -1 || mask > 7) - throw new IllegalArgumentException("Invalid value"); - - // Find the minimal version number to use - int version, dataUsedBits; - for (version = minVersion; ; version++) { - int dataCapacityBits = getNumDataCodewords(version, ecl) * 8; // Number of data bits available - dataUsedBits = QrSegment.getTotalBits(segs, version); - if (dataUsedBits != -1 && dataUsedBits <= dataCapacityBits) - break; // This version number is found to be suitable - if (version >= maxVersion) // All versions in the range could not fit the given data - throw new IllegalArgumentException("Data too long"); - } - if (dataUsedBits == -1) - throw new AssertionError(); - - // Increase the error correction level while the data still fits in the current version number - for (Ecc newEcl : Ecc.values()) { - if (boostEcl && dataUsedBits <= getNumDataCodewords(version, newEcl) * 8) - ecl = newEcl; - } - - // Create the data bit string by concatenating all segments - int dataCapacityBits = getNumDataCodewords(version, ecl) * 8; - BitBuffer bb = new BitBuffer(); - for (QrSegment seg : segs) { - bb.appendBits(seg.mode.modeBits, 4); - bb.appendBits(seg.numChars, seg.mode.numCharCountBits(version)); - bb.appendData(seg); - } - - // Add terminator and pad up to a byte if applicable - bb.appendBits(0, Math.min(4, dataCapacityBits - bb.bitLength())); - bb.appendBits(0, (8 - bb.bitLength() % 8) % 8); - - // Pad with alternate bytes until data capacity is reached - for (int padByte = 0xEC; bb.bitLength() < dataCapacityBits; padByte ^= 0xEC ^ 0x11) - bb.appendBits(padByte, 8); - if (bb.bitLength() % 8 != 0) - throw new AssertionError(); - - // Create the QR Code symbol - return new QrCode(version, ecl, bb.getBytes(), mask); - } - - - - /*---- Instance fields ----*/ - - // Public immutable scalar parameters - - /** This QR Code symbol's version number, which is always between 1 and 40 (inclusive). */ - public final int version; - - /** The width and height of this QR Code symbol, measured in modules. - * Always equal to version × 4 + 17, in the range 21 to 177. */ - public final int size; - - /** The error correction level used in this QR Code symbol. Never {@code null}. */ - public final Ecc errorCorrectionLevel; - - /** The mask pattern used in this QR Code symbol, in the range 0 to 7 (i.e. unsigned 3-bit integer). - * Note that even if a constructor was called with automatic masking requested - * (mask = -1), the resulting object will still have a mask value between 0 and 7. */ - public final int mask; - - // Private grids of modules/pixels (conceptually immutable) - private boolean[][] modules; // The modules of this QR Code symbol (false = white, true = black) - private boolean[][] isFunction; // Indicates function modules that are not subjected to masking - - - - /*---- Constructors ----*/ - - /** - * Creates a new QR Code symbol with the specified version number, error correction level, binary data array, and mask number. - *

    This is a cumbersome low-level constructor that should not be invoked directly by the user. - * To go one level up, see the {@link #encodeSegments(List,Ecc)} function.

    - * @param ver the version number to use, which must be in the range 1 to 40, inclusive - * @param ecl the error correction level to use - * @param dataCodewords the raw binary user data to encode - * @param mask the mask pattern to use, which is either -1 for automatic choice or from 0 to 7 for fixed choice - * @throws NullPointerException if the byte array or error correction level is {@code null} - * @throws IllegalArgumentException if the version or mask value is out of range - */ - public QrCode(int ver, @NonNull Ecc ecl, @NonNull byte[] dataCodewords, int mask) { - // Check arguments - if (ver < 1 || ver > 40 || mask < -1 || mask > 7) - throw new IllegalArgumentException("Value out of range"); - - // Initialize fields - version = ver; - size = ver * 4 + 17; - errorCorrectionLevel = ecl; - modules = new boolean[size][size]; // Entirely white grid - isFunction = new boolean[size][size]; - - // Draw function patterns, draw all codewords, do masking - drawFunctionPatterns(); - byte[] allCodewords = appendErrorCorrection(dataCodewords); - drawCodewords(allCodewords); - this.mask = handleConstructorMasking(mask); - } - - - /** - * Creates a new QR Code symbol based on the specified existing object, but with a potentially - * different mask pattern. The version, error correction level, codewords, etc. of the newly - * created object are all identical to the argument object; only the mask may differ. - * @param qr the existing QR Code to copy and modify - * @param mask the new mask pattern, 0 to 7 to force a fixed choice or -1 for an automatic choice - * @throws NullPointerException if the QR Code is {@code null} - * @throws IllegalArgumentException if the mask value is out of range - */ - public QrCode(@NonNull QrCode qr, int mask) { - // Check arguments - if (mask < -1 || mask > 7) - throw new IllegalArgumentException("Mask value out of range"); - - // Copy scalar fields - version = qr.version; - size = qr.size; - errorCorrectionLevel = qr.errorCorrectionLevel; - - // Handle grid fields - isFunction = qr.isFunction; // Shallow copy because the data is read-only - modules = qr.modules.clone(); // Deep copy - for (int i = 0; i < modules.length; i++) - modules[i] = modules[i].clone(); - - // Handle masking - applyMask(qr.mask); // Undo old mask - this.mask = handleConstructorMasking(mask); - } - - - - /*---- Public instance methods ----*/ - - /** - * Returns the color of the module (pixel) at the specified coordinates, which is either 0 for white or 1 for black. The top - * left corner has the coordinates (x=0, y=0). If the specified coordinates are out of bounds, then 0 (white) is returned. - * @param x the x coordinate, where 0 is the left edge and size−1 is the right edge - * @param y the y coordinate, where 0 is the top edge and size−1 is the bottom edge - * @return the module's color, which is either 0 (white) or 1 (black) - */ - public int getModule(int x, int y) { - if (0 <= x && x < size && 0 <= y && y < size) - return modules[y][x] ? 1 : 0; - else - return 0; // Infinite white border - } - - /*---- Private helper methods for constructor: Drawing function modules ----*/ - - private void drawFunctionPatterns() { - // Draw horizontal and vertical timing patterns - for (int i = 0; i < size; i++) { - setFunctionModule(6, i, i % 2 == 0); - setFunctionModule(i, 6, i % 2 == 0); - } - - // Draw 3 finder patterns (all corners except bottom right; overwrites some timing modules) - drawFinderPattern(3, 3); - drawFinderPattern(size - 4, 3); - drawFinderPattern(3, size - 4); - - // Draw numerous alignment patterns - int[] alignPatPos = getAlignmentPatternPositions(version); - int numAlign = alignPatPos.length; - for (int i = 0; i < numAlign; i++) { - for (int j = 0; j < numAlign; j++) { - if (i == 0 && j == 0 || i == 0 && j == numAlign - 1 || i == numAlign - 1 && j == 0) - continue; // Skip the three finder corners - else - drawAlignmentPattern(alignPatPos[i], alignPatPos[j]); - } - } - - // Draw configuration data - drawFormatBits(0); // Dummy mask value; overwritten later in the constructor - drawVersion(); - } - - - // Draws two copies of the format bits (with its own error correction code) - // based on the given mask and this object's error correction level field. - private void drawFormatBits(int mask) { - // Calculate error correction code and pack bits - int data = errorCorrectionLevel.formatBits << 3 | mask; // errCorrLvl is uint2, mask is uint3 - int rem = data; - for (int i = 0; i < 10; i++) - rem = (rem << 1) ^ ((rem >>> 9) * 0x537); - data = data << 10 | rem; - data ^= 0x5412; // uint15 - if (data >>> 15 != 0) - throw new AssertionError(); - - // Draw first copy - for (int i = 0; i <= 5; i++) - setFunctionModule(8, i, ((data >>> i) & 1) != 0); - setFunctionModule(8, 7, ((data >>> 6) & 1) != 0); - setFunctionModule(8, 8, ((data >>> 7) & 1) != 0); - setFunctionModule(7, 8, ((data >>> 8) & 1) != 0); - for (int i = 9; i < 15; i++) - setFunctionModule(14 - i, 8, ((data >>> i) & 1) != 0); - - // Draw second copy - for (int i = 0; i <= 7; i++) - setFunctionModule(size - 1 - i, 8, ((data >>> i) & 1) != 0); - for (int i = 8; i < 15; i++) - setFunctionModule(8, size - 15 + i, ((data >>> i) & 1) != 0); - setFunctionModule(8, size - 8, true); - } - - - // Draws two copies of the version bits (with its own error correction code), - // based on this object's version field (which only has an effect for 7 <= version <= 40). - private void drawVersion() { - if (version < 7) - return; - - // Calculate error correction code and pack bits - int rem = version; // version is uint6, in the range [7, 40] - for (int i = 0; i < 12; i++) - rem = (rem << 1) ^ ((rem >>> 11) * 0x1F25); - int data = version << 12 | rem; // uint18 - if (data >>> 18 != 0) - throw new AssertionError(); - - // Draw two copies - for (int i = 0; i < 18; i++) { - boolean bit = ((data >>> i) & 1) != 0; - int a = size - 11 + i % 3, b = i / 3; - setFunctionModule(a, b, bit); - setFunctionModule(b, a, bit); - } - } - - - // Draws a 9*9 finder pattern including the border separator, with the center module at (x, y). - private void drawFinderPattern(int x, int y) { - for (int i = -4; i <= 4; i++) { - for (int j = -4; j <= 4; j++) { - int dist = Math.max(Math.abs(i), Math.abs(j)); // Chebyshev/infinity norm - int xx = x + j, yy = y + i; - if (0 <= xx && xx < size && 0 <= yy && yy < size) - setFunctionModule(xx, yy, dist != 2 && dist != 4); - } - } - } - - - // Draws a 5*5 alignment pattern, with the center module at (x, y). - private void drawAlignmentPattern(int x, int y) { - for (int i = -2; i <= 2; i++) { - for (int j = -2; j <= 2; j++) - setFunctionModule(x + j, y + i, Math.max(Math.abs(i), Math.abs(j)) != 1); - } - } - - - // Sets the color of a module and marks it as a function module. - // Only used by the constructor. Coordinates must be in range. - private void setFunctionModule(int x, int y, boolean isBlack) { - modules[y][x] = isBlack; - isFunction[y][x] = true; - } - - - /*---- Private helper methods for constructor: Codewords and masking ----*/ - - // Returns a new byte string representing the given data with the appropriate error correction - // codewords appended to it, based on this object's version and error correction level. - private byte[] appendErrorCorrection(byte[] data) { - if (data.length != getNumDataCodewords(version, errorCorrectionLevel)) - throw new IllegalArgumentException(); - - // Calculate parameter numbers - int numBlocks = NUM_ERROR_CORRECTION_BLOCKS[errorCorrectionLevel.ordinal()][version]; - int blockEccLen = ECC_CODEWORDS_PER_BLOCK[errorCorrectionLevel.ordinal()][version]; - int rawCodewords = getNumRawDataModules(version) / 8; - int numShortBlocks = numBlocks - rawCodewords % numBlocks; - int shortBlockLen = rawCodewords / numBlocks; - - // Split data into blocks and append ECC to each block - byte[][] blocks = new byte[numBlocks][]; - ReedSolomonGenerator rs = new ReedSolomonGenerator(blockEccLen); - for (int i = 0, k = 0; i < numBlocks; i++) { - byte[] dat = Arrays.copyOfRange(data, k, k + shortBlockLen - blockEccLen + (i < numShortBlocks ? 0 : 1)); - byte[] block = Arrays.copyOf(dat, shortBlockLen + 1); - k += dat.length; - byte[] ecc = rs.getRemainder(dat); - System.arraycopy(ecc, 0, block, block.length - blockEccLen, ecc.length); - blocks[i] = block; - } - - // Interleave (not concatenate) the bytes from every block into a single sequence - byte[] result = new byte[rawCodewords]; - for (int i = 0, k = 0; i < blocks[0].length; i++) { - for (int j = 0; j < blocks.length; j++) { - // Skip the padding byte in short blocks - if (i != shortBlockLen - blockEccLen || j >= numShortBlocks) { - result[k] = blocks[j][i]; - k++; - } - } - } - return result; - } - - - // Draws the given sequence of 8-bit codewords (data and error correction) onto the entire - // data area of this QR Code symbol. Function modules need to be marked off before this is called. - private void drawCodewords(@NonNull byte[] data) { - if (data.length != getNumRawDataModules(version) / 8) - throw new IllegalArgumentException(); - - int i = 0; // Bit index into the data - // Do the funny zigzag scan - for (int right = size - 1; right >= 1; right -= 2) { // Index of right column in each column pair - if (right == 6) - right = 5; - for (int vert = 0; vert < size; vert++) { // Vertical counter - for (int j = 0; j < 2; j++) { - int x = right - j; // Actual x coordinate - boolean upward = ((right + 1) & 2) == 0; - int y = upward ? size - 1 - vert : vert; // Actual y coordinate - if (!isFunction[y][x] && i < data.length * 8) { - modules[y][x] = ((data[i >>> 3] >>> (7 - (i & 7))) & 1) != 0; - i++; - } - // If there are any remainder bits (0 to 7), they are already - // set to 0/false/white when the grid of modules was initialized - } - } - } - if (i != data.length * 8) - throw new AssertionError(); - } - - - // XORs the data modules in this QR Code with the given mask pattern. Due to XOR's mathematical - // properties, calling applyMask(m) twice with the same value is equivalent to no change at all. - // This means it is possible to apply a mask, undo it, and try another mask. Note that a final - // well-formed QR Code symbol needs exactly one mask applied (not zero, not two, etc.). - private void applyMask(int mask) { - if (mask < 0 || mask > 7) - throw new IllegalArgumentException("Mask value out of range"); - for (int y = 0; y < size; y++) { - for (int x = 0; x < size; x++) { - boolean invert; - switch (mask) { - case 0: invert = (x + y) % 2 == 0; break; - case 1: invert = y % 2 == 0; break; - case 2: invert = x % 3 == 0; break; - case 3: invert = (x + y) % 3 == 0; break; - case 4: invert = (x / 3 + y / 2) % 2 == 0; break; - case 5: invert = x * y % 2 + x * y % 3 == 0; break; - case 6: invert = (x * y % 2 + x * y % 3) % 2 == 0; break; - case 7: invert = ((x + y) % 2 + x * y % 3) % 2 == 0; break; - default: throw new AssertionError(); - } - modules[y][x] ^= invert & !isFunction[y][x]; - } - } - } - - - // A messy helper function for the constructors. This QR Code must be in an unmasked state when this - // method is called. The given argument is the requested mask, which is -1 for auto or 0 to 7 for fixed. - // This method applies and returns the actual mask chosen, from 0 to 7. - private int handleConstructorMasking(int mask) { - if (mask == -1) { // Automatically choose best mask - int minPenalty = Integer.MAX_VALUE; - for (int i = 0; i < 8; i++) { - drawFormatBits(i); - applyMask(i); - int penalty = getPenaltyScore(); - if (penalty < minPenalty) { - mask = i; - minPenalty = penalty; - } - applyMask(i); // Undoes the mask due to XOR - } - } - if (mask < 0 || mask > 7) - throw new AssertionError(); - drawFormatBits(mask); // Overwrite old format bits - applyMask(mask); // Apply the final choice of mask - return mask; // The caller shall assign this value to the final-declared field - } - - - // Calculates and returns the penalty score based on state of this QR Code's current modules. - // This is used by the automatic mask choice algorithm to find the mask pattern that yields the lowest score. - private int getPenaltyScore() { - int result = 0; - - // Adjacent modules in row having same color - for (int y = 0; y < size; y++) { - boolean colorX = false; - for (int x = 0, runX = 0; x < size; x++) { - if (x == 0 || modules[y][x] != colorX) { - colorX = modules[y][x]; - runX = 1; - } else { - runX++; - if (runX == 5) - result += PENALTY_N1; - else if (runX > 5) - result++; - } - } - } - // Adjacent modules in column having same color - for (int x = 0; x < size; x++) { - boolean colorY = false; - for (int y = 0, runY = 0; y < size; y++) { - if (y == 0 || modules[y][x] != colorY) { - colorY = modules[y][x]; - runY = 1; - } else { - runY++; - if (runY == 5) - result += PENALTY_N1; - else if (runY > 5) - result++; - } - } - } - - // 2*2 blocks of modules having same color - for (int y = 0; y < size - 1; y++) { - for (int x = 0; x < size - 1; x++) { - boolean color = modules[y][x]; - if ( color == modules[y][x + 1] && - color == modules[y + 1][x] && - color == modules[y + 1][x + 1]) - result += PENALTY_N2; - } - } - - // Finder-like pattern in rows - for (int y = 0; y < size; y++) { - for (int x = 0, bits = 0; x < size; x++) { - bits = ((bits << 1) & 0x7FF) | (modules[y][x] ? 1 : 0); - if (x >= 10 && (bits == 0x05D || bits == 0x5D0)) // Needs 11 bits accumulated - result += PENALTY_N3; - } - } - // Finder-like pattern in columns - for (int x = 0; x < size; x++) { - for (int y = 0, bits = 0; y < size; y++) { - bits = ((bits << 1) & 0x7FF) | (modules[y][x] ? 1 : 0); - if (y >= 10 && (bits == 0x05D || bits == 0x5D0)) // Needs 11 bits accumulated - result += PENALTY_N3; - } - } - - // Balance of black and white modules - int black = 0; - for (boolean[] row : modules) { - for (boolean color : row) { - if (color) - black++; - } - } - int total = size * size; - // Find smallest k such that (45-5k)% <= dark/total <= (55+5k)% - for (int k = 0; black*20 < (9-k)*total || black*20 > (11+k)*total; k++) - result += PENALTY_N4; - return result; - } - - - - /*---- Private static helper functions ----*/ - - // Returns a set of positions of the alignment patterns in ascending order. These positions are - // used on both the x and y axes. Each value in the resulting array is in the range [0, 177). - // This stateless pure function could be implemented as table of 40 variable-length lists of unsigned bytes. - private static int[] getAlignmentPatternPositions(int ver) { - if (ver < 1 || ver > 40) - throw new IllegalArgumentException("Version number out of range"); - else if (ver == 1) - return new int[]{}; - else { - int numAlign = ver / 7 + 2; - int step; - if (ver != 32) - step = (ver * 4 + numAlign * 2 + 1) / (2 * numAlign - 2) * 2; // ceil((size - 13) / (2*numAlign - 2)) * 2 - else // C-C-C-Combo breaker! - step = 26; - - int[] result = new int[numAlign]; - int size = ver * 4 + 17; - result[0] = 6; - for (int i = result.length - 1, pos = size - 7; i >= 1; i--, pos -= step) - result[i] = pos; - return result; - } - } - - - // Returns the number of data bits that can be stored in a QR Code of the given version number, after - // all function modules are excluded. This includes remainder bits, so it might not be a multiple of 8. - // The result is in the range [208, 29648]. This could be implemented as a 40-entry lookup table. - private static int getNumRawDataModules(int ver) { - if (ver < 1 || ver > 40) - throw new IllegalArgumentException("Version number out of range"); - - int size = ver * 4 + 17; - int result = size * size; // Number of modules in the whole QR symbol square - result -= 64 * 3; // Subtract the three finders with separators - result -= 15 * 2 + 1; // Subtract the format information and black module - result -= (size - 16) * 2; // Subtract the timing patterns - // The five lines above are equivalent to: int result = (16 * ver + 128) * ver + 64; - if (ver >= 2) { - int numAlign = ver / 7 + 2; - result -= (numAlign - 1) * (numAlign - 1) * 25; // Subtract alignment patterns not overlapping with timing patterns - result -= (numAlign - 2) * 2 * 20; // Subtract alignment patterns that overlap with timing patterns - // The two lines above are equivalent to: result -= (25 * numAlign - 10) * numAlign - 55; - if (ver >= 7) - result -= 18 * 2; // Subtract version information - } - return result; - } - - - // Returns the number of 8-bit data (i.e. not error correction) codewords contained in any - // QR Code of the given version number and error correction level, with remainder bits discarded. - // This stateless pure function could be implemented as a (40*4)-cell lookup table. - static int getNumDataCodewords(int ver, Ecc ecl) { - if (ver < 1 || ver > 40) - throw new IllegalArgumentException("Version number out of range"); - return getNumRawDataModules(ver) / 8 - ECC_CODEWORDS_PER_BLOCK[ecl.ordinal()][ver] * NUM_ERROR_CORRECTION_BLOCKS[ecl.ordinal()][ver]; - } - - - /*---- Private tables of constants ----*/ - - // For use in getPenaltyScore(), when evaluating which mask is best. - private static final int PENALTY_N1 = 3; - private static final int PENALTY_N2 = 3; - private static final int PENALTY_N3 = 40; - private static final int PENALTY_N4 = 10; - - - private static final byte[][] ECC_CODEWORDS_PER_BLOCK = { - // Version: (note that index 0 is for padding, and is set to an illegal value) - //0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40 Error correction level - {-1, 7, 10, 15, 20, 26, 18, 20, 24, 30, 18, 20, 24, 26, 30, 22, 24, 28, 30, 28, 28, 28, 28, 30, 30, 26, 28, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30}, // Low - {-1, 10, 16, 26, 18, 24, 16, 18, 22, 22, 26, 30, 22, 22, 24, 24, 28, 28, 26, 26, 26, 26, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28}, // Medium - {-1, 13, 22, 18, 26, 18, 24, 18, 22, 20, 24, 28, 26, 24, 20, 30, 24, 28, 28, 26, 30, 28, 30, 30, 30, 30, 28, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30}, // Quartile - {-1, 17, 28, 22, 16, 22, 28, 26, 26, 24, 28, 24, 28, 22, 24, 24, 30, 28, 28, 26, 28, 30, 24, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30}, // High - }; - - private static final byte[][] NUM_ERROR_CORRECTION_BLOCKS = { - // Version: (note that index 0 is for padding, and is set to an illegal value) - //0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40 Error correction level - {-1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 4, 4, 4, 4, 4, 6, 6, 6, 6, 7, 8, 8, 9, 9, 10, 12, 12, 12, 13, 14, 15, 16, 17, 18, 19, 19, 20, 21, 22, 24, 25}, // Low - {-1, 1, 1, 1, 2, 2, 4, 4, 4, 5, 5, 5, 8, 9, 9, 10, 10, 11, 13, 14, 16, 17, 17, 18, 20, 21, 23, 25, 26, 28, 29, 31, 33, 35, 37, 38, 40, 43, 45, 47, 49}, // Medium - {-1, 1, 1, 2, 2, 4, 4, 6, 6, 8, 8, 8, 10, 12, 16, 12, 17, 16, 18, 21, 20, 23, 23, 25, 27, 29, 34, 34, 35, 38, 40, 43, 45, 48, 51, 53, 56, 59, 62, 65, 68}, // Quartile - {-1, 1, 1, 2, 4, 4, 4, 5, 6, 8, 8, 11, 11, 16, 16, 18, 16, 19, 21, 25, 25, 25, 34, 30, 32, 35, 37, 40, 42, 45, 48, 51, 54, 57, 60, 63, 66, 70, 74, 77, 81}, // High - }; - - - - /*---- Public helper enumeration ----*/ - - /** - * Represents the error correction level used in a QR Code symbol. - */ - public enum Ecc { - // These enum constants must be declared in ascending order of error protection, - // for the sake of the implicit ordinal() method and values() function. - LOW(1), MEDIUM(0), QUARTILE(3), HIGH(2); - - // In the range 0 to 3 (unsigned 2-bit integer). - final int formatBits; - - // Constructor. - Ecc(int fb) { - formatBits = fb; - } - } - - - - /*---- Private helper class ----*/ - - /** - * Computes the Reed-Solomon error correction codewords for a sequence of data codewords - * at a given degree. Objects are immutable, and the state only depends on the degree. - * This class exists because the divisor polynomial does not need to be recalculated for every input. - */ - private static final class ReedSolomonGenerator { - - /*-- Immutable field --*/ - - // Coefficients of the divisor polynomial, stored from highest to lowest power, excluding the leading term which - // is always 1. For example the polynomial x^3 + 255x^2 + 8x + 93 is stored as the uint8 array {255, 8, 93}. - private final byte[] coefficients; - - - /*-- Constructor --*/ - - /** - * Creates a Reed-Solomon ECC generator for the specified degree. This could be implemented - * as a lookup table over all possible parameter values, instead of as an algorithm. - * @param degree the divisor polynomial degree, which must be between 1 and 255 - * @throws IllegalArgumentException if degree < 1 or degree > 255 - */ - public ReedSolomonGenerator(int degree) { - if (degree < 1 || degree > 255) - throw new IllegalArgumentException("Degree out of range"); - - // Start with the monomial x^0 - coefficients = new byte[degree]; - coefficients[degree - 1] = 1; - - // Compute the product polynomial (x - r^0) * (x - r^1) * (x - r^2) * ... * (x - r^{degree-1}), - // drop the highest term, and store the rest of the coefficients in order of descending powers. - // Note that r = 0x02, which is a generator element of this field GF(2^8/0x11D). - int root = 1; - for (int i = 0; i < degree; i++) { - // Multiply the current product by (x - r^i) - for (int j = 0; j < coefficients.length; j++) { - coefficients[j] = (byte)multiply(coefficients[j] & 0xFF, root); - if (j + 1 < coefficients.length) - coefficients[j] ^= coefficients[j + 1]; - } - root = multiply(root, 0x02); - } - } - - - /*-- Method --*/ - - /** - * Computes and returns the Reed-Solomon error correction codewords for the specified sequence of data codewords. - * The returned object is always a new byte array. This method does not alter this object's state (because it is immutable). - * @param data the sequence of data codewords - * @return the Reed-Solomon error correction codewords - * @throws NullPointerException if the data is {@code null} - */ - public byte[] getRemainder(@NonNull byte[] data) { - // Compute the remainder by performing polynomial division - byte[] result = new byte[coefficients.length]; - for (byte b : data) { - int factor = (b ^ result[0]) & 0xFF; - System.arraycopy(result, 1, result, 0, result.length - 1); - result[result.length - 1] = 0; - for (int i = 0; i < result.length; i++) - result[i] ^= multiply(coefficients[i] & 0xFF, factor); - } - return result; - } - - - /*-- Static function --*/ - - // Returns the product of the two given field elements modulo GF(2^8/0x11D). The arguments and result - // are unsigned 8-bit integers. This could be implemented as a lookup table of 256*256 entries of uint8. - private static int multiply(int x, int y) { - if (x >>> 8 != 0 || y >>> 8 != 0) - throw new IllegalArgumentException("Byte out of range"); - // Russian peasant multiplication - int z = 0; - for (int i = 7; i >= 0; i--) { - z = (z << 1) ^ ((z >>> 7) * 0x11D); - z ^= ((y >>> i) & 1) * x; - } - if (z >>> 8 != 0) - throw new AssertionError(); - return z; - } - - } - -} diff --git a/twidere/src/main/java/io/nayuki/qrcodegen/QrSegment.java b/twidere/src/main/java/io/nayuki/qrcodegen/QrSegment.java deleted file mode 100755 index 417d1e49e..000000000 --- a/twidere/src/main/java/io/nayuki/qrcodegen/QrSegment.java +++ /dev/null @@ -1,280 +0,0 @@ -/* - * QR Code generator library (Java) - * - * Copyright (c) Project Nayuki. (MIT License) - * https://www.nayuki.io/page/qr-code-generator-library - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - The Software is provided "as is", without warranty of any kind, express or - * implied, including but not limited to the warranties of merchantability, - * fitness for a particular purpose and noninfringement. In no event shall the - * authors or copyright holders be liable for any claim, damages or other - * liability, whether in an action of contract, tort or otherwise, arising from, - * out of or in connection with the Software or the use or other dealings in the - * Software. - */ - -package io.nayuki.qrcodegen; - -import androidx.annotation.NonNull; - -import java.nio.charset.Charset; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.regex.Pattern; - - -/** - * Represents a character string to be encoded in a QR Code symbol. Each segment has - * a mode, and a sequence of characters that is already encoded as a sequence of bits. - * Instances of this class are immutable. - *

    This segment class imposes no length restrictions, but QR Codes have restrictions. - * Even in the most favorable conditions, a QR Code can only hold 7089 characters of data. - * Any segment longer than this is meaningless for the purpose of generating QR Codes.

    - */ -public final class QrSegment { - - /*---- Static factory functions ----*/ - - /** - * Returns a segment representing the specified binary data encoded in byte mode. - * @param data the binary data - * @return a segment containing the data - * @throws NullPointerException if the array is {@code null} - */ - public static QrSegment makeBytes(@NonNull byte[] data) { - return new QrSegment(Mode.BYTE, data.length, data, data.length * 8); - } - - - /** - * Returns a segment representing the specified string of decimal digits encoded in numeric mode. - * @param digits a string consisting of digits from 0 to 9 - * @return a segment containing the data - * @throws NullPointerException if the string is {@code null} - * @throws IllegalArgumentException if the string contains non-digit characters - */ - public static QrSegment makeNumeric(@NonNull String digits) { - if (!NUMERIC_REGEX.matcher(digits).matches()) - throw new IllegalArgumentException("String contains non-numeric characters"); - - BitBuffer bb = new BitBuffer(); - int i; - for (i = 0; i + 3 <= digits.length(); i += 3) // Process groups of 3 - bb.appendBits(Integer.parseInt(digits.substring(i, i + 3)), 10); - int rem = digits.length() - i; - if (rem > 0) // 1 or 2 digits remaining - bb.appendBits(Integer.parseInt(digits.substring(i)), rem * 3 + 1); - return new QrSegment(Mode.NUMERIC, digits.length(), bb.getBytes(), bb.bitLength()); - } - - - /** - * Returns a segment representing the specified text string encoded in alphanumeric mode. The characters allowed are: - * 0 to 9, A to Z (uppercase only), space, dollar, percent, asterisk, plus, hyphen, period, slash, colon. - * @param text a string of text, with only certain characters allowed - * @return a segment containing the data - * @throws NullPointerException if the string is {@code null} - * @throws IllegalArgumentException if the string contains non-encodable characters - */ - public static QrSegment makeAlphanumeric(@NonNull String text) { - if (!ALPHANUMERIC_REGEX.matcher(text).matches()) - throw new IllegalArgumentException("String contains unencodable characters in alphanumeric mode"); - - BitBuffer bb = new BitBuffer(); - int i; - for (i = 0; i + 2 <= text.length(); i += 2) { // Process groups of 2 - int temp = ALPHANUMERIC_CHARSET.indexOf(text.charAt(i)) * 45; - temp += ALPHANUMERIC_CHARSET.indexOf(text.charAt(i + 1)); - bb.appendBits(temp, 11); - } - if (i < text.length()) // 1 character remaining - bb.appendBits(ALPHANUMERIC_CHARSET.indexOf(text.charAt(i)), 6); - return new QrSegment(Mode.ALPHANUMERIC, text.length(), bb.getBytes(), bb.bitLength()); - } - - - /** - * Returns a new mutable list of zero or more segments to represent the specified Unicode text string. - * The result may use various segment modes and switch modes to optimize the length of the bit stream. - * @param text the text to be encoded, which can be any Unicode string - * @return a list of segments containing the text - * @throws NullPointerException if the text is {@code null} - */ - public static List makeSegments(@NonNull String text) { - // Select the most efficient segment encoding automatically - List result = new ArrayList<>(); - if (text.equals("")) - return result; - else if (NUMERIC_REGEX.matcher(text).matches()) - result.add(makeNumeric(text)); - else if (ALPHANUMERIC_REGEX.matcher(text).matches()) - result.add(makeAlphanumeric(text)); - else - result.add(makeBytes(text.getBytes(Charset.forName("UTF-8")))); - return result; - } - - - /** - * Returns a segment representing an Extended Channel Interpretation (ECI) designator with the specified assignment value. - * @param assignVal the ECI assignment number (see the AIM ECI specification) - * @return a segment containing the data - * @throws IllegalArgumentException if the value is outside the range [0, 106) - */ - public static QrSegment makeEci(int assignVal) { - byte[] data; - if (0 <= assignVal && assignVal < (1 << 7)) - data = new byte[]{(byte)assignVal}; - else if ((1 << 7) <= assignVal && assignVal < (1 << 14)) - data = new byte[]{(byte)(0x80 | (assignVal >>> 8)), (byte)assignVal}; - else if ((1 << 14) <= assignVal && assignVal < 999999) - data = new byte[]{(byte)(0xC0 | (assignVal >>> 16)), (byte)(assignVal >>> 8), (byte)assignVal}; - else - throw new IllegalArgumentException("ECI assignment value out of range"); - return new QrSegment(Mode.ECI, 0, data, data.length * 8); - } - - - - /*---- Instance fields ----*/ - - /** The mode indicator for this segment. Never {@code null}. */ - public final Mode mode; - - /** The length of this segment's unencoded data, measured in characters. Always zero or positive. */ - public final int numChars; - - /** The bits of this segment packed into a byte array in big endian. Accessed through {@link #getByte(int)}. Not {@code null}. */ - private final byte[] data; - - /** The length of this segment's encoded data, measured in bits. Satisfies 0 ≤ {@code bitLength} ≤ {@code data.length} × 8. */ - public final int bitLength; - - - /*---- Constructor ----*/ - - /** - * Creates a new QR Code data segment with the specified parameters and data. - * @param md the mode, which is not {@code null} - * @param numCh the data length in characters, which is non-negative - * @param bitLen the data length in bits, which is non-negative - * @param b the bits packed into bytes, which is not {@code null} - * @throws NullPointerException if the mode or array is {@code null} - * @throws IllegalArgumentException if the character count or bit length are negative or invalid - */ - public QrSegment(@NonNull Mode md, int numCh, @NonNull byte[] b, int bitLen) { - if (numCh < 0 || bitLen < 0 || bitLen > b.length * 8L) - throw new IllegalArgumentException("Invalid value"); - mode = md; - numChars = numCh; - data = Arrays.copyOf(b, (bitLen + 7) / 8); // Trim to precise length and also make defensive copy - bitLength = bitLen; - } - - - /*---- Method ----*/ - - /** - * Returns the data byte at the specified index. - * @param index the index to retrieve from, satisfying 0 ≤ {@code index} < ceil({@code bitLength} ÷ 8) - * @return the data byte at the specified index - * @throws IndexOutOfBoundsException if the index is out of bounds - */ - public byte getByte(int index) { - if (index < 0 || index > data.length) - throw new IndexOutOfBoundsException(); - return data[index]; - } - - - // Package-private helper function. - static int getTotalBits(@NonNull List segs, int version) { - if (version < 1 || version > 40) - throw new IllegalArgumentException("Version number out of range"); - - long result = 0; - for (QrSegment seg : segs) { - int ccbits = seg.mode.numCharCountBits(version); - // Fail if segment length value doesn't fit in the length field's bit-width - if (seg.numChars >= (1 << ccbits)) - return -1; - result += 4L + ccbits + seg.bitLength; - if (result > Integer.MAX_VALUE) - return -1; - } - return (int)result; - } - - - /*---- Constants ----*/ - - /** Can test whether a string is encodable in numeric mode (such as by using {@link #makeNumeric(String)}). */ - public static final Pattern NUMERIC_REGEX = Pattern.compile("[0-9]*"); - - /** Can test whether a string is encodable in alphanumeric mode (such as by using {@link #makeAlphanumeric(String)}). */ - public static final Pattern ALPHANUMERIC_REGEX = Pattern.compile("[A-Z0-9 $%*+./:-]*"); - - /** The set of all legal characters in alphanumeric mode, where each character value maps to the index in the string. */ - private static final String ALPHANUMERIC_CHARSET = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ $%*+-./:"; - - - - /*---- Public helper enumeration ----*/ - - /** - * The mode field of a segment. Immutable. Provides methods to retrieve closely related values. - */ - public enum Mode { - - /*-- Constants --*/ - - NUMERIC (0x1, 10, 12, 14), - ALPHANUMERIC(0x2, 9, 11, 13), - BYTE (0x4, 8, 16, 16), - KANJI (0x8, 8, 10, 12), - ECI (0x7, 0, 0, 0); - - - /*-- Fields --*/ - - /** An unsigned 4-bit integer value (range 0 to 15) representing the mode indicator bits for this mode object. */ - final int modeBits; - - private final int[] numBitsCharCount; - - - /*-- Constructor --*/ - - Mode(int mode, int... ccbits) { - this.modeBits = mode; - numBitsCharCount = ccbits; - } - - - /*-- Method --*/ - - /** - * Returns the bit width of the segment character count field for this mode object at the specified version number. - * @param ver the version number, which is between 1 to 40, inclusive - * @return the number of bits for the character count, which is between 8 to 16, inclusive - * @throws IllegalArgumentException if the version number is out of range - */ - int numCharCountBits(int ver) { - if ( 1 <= ver && ver <= 9) return numBitsCharCount[0]; - else if (10 <= ver && ver <= 26) return numBitsCharCount[1]; - else if (27 <= ver && ver <= 40) return numBitsCharCount[2]; - else throw new IllegalArgumentException("Version number out of range"); - } - - } - -} diff --git a/twidere/src/main/java/io/nayuki/qrcodegen/package-info.java b/twidere/src/main/java/io/nayuki/qrcodegen/package-info.java deleted file mode 100644 index c8bd41239..000000000 --- a/twidere/src/main/java/io/nayuki/qrcodegen/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -/** - * This package contains code from https://github.com/nayuki/QR-Code-generator - * And licensed under MIT license - */ -package io.nayuki.qrcodegen; \ No newline at end of file diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/qr/QrCodeData.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/qr/QrCodeData.kt index db8ada3b2..207b4daf9 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/qr/QrCodeData.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/qr/QrCodeData.kt @@ -33,5 +33,5 @@ data class QrCodeData(private val qrCode: QrCode) : QrData { override fun getVersion() = qrCode.version - override fun get(x: Int, y: Int) = qrCode.getModule(x, y) == 1 + override fun get(x: Int, y: Int) = qrCode.getModule(x, y) } From 47bf66c628d079471c1e41684036443ddebfbb9b Mon Sep 17 00:00:00 2001 From: TacoTheDank Date: Sun, 28 Jun 2020 23:11:50 -0400 Subject: [PATCH 09/29] Update some of Mariotaku's libraries --- build.gradle | 4 ++-- twidere/build.gradle | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index 60733681d..1d533ccb6 100644 --- a/build.gradle +++ b/build.gradle @@ -47,9 +47,9 @@ subprojects { ParcelablePlease : '1.0.2', ExportablePreferences: '0.9.7', - MariotakuCommons : '0.9.20', + MariotakuCommons : '0.9.22', ObjectCursor : '0.9.21', - RestFu : '0.9.60', + RestFu : '0.9.64', ] } } diff --git a/twidere/build.gradle b/twidere/build.gradle index 56d261e18..a63f6adbd 100644 --- a/twidere/build.gradle +++ b/twidere/build.gradle @@ -179,7 +179,6 @@ ext { Exoplayer : '2.11.6', Glide : '4.11.0', MediaViewerLibrary: '0.9.23', - PlayServices : '17.0.0', Stetho : '1.5.1', ] } @@ -257,7 +256,7 @@ dependencies { /** Custom dependencies **/ - implementation 'com.github.mariotaku:AbstractTask:0.9.5' + implementation 'com.github.mariotaku:AbstractTask:0.9.7' implementation 'com.github.mariotaku:DragSortListView:0.6.1' implementation "com.github.mariotaku.ExportablePreferences:core:${sharedVersions['ExportablePreferences']}" implementation("com.github.mariotaku.CommonsLibrary:emojione-android:${sharedVersions['MariotakuCommons']}") { @@ -275,14 +274,14 @@ dependencies { implementation 'com.github.mariotaku:MessageBubbleView:3.5' implementation "com.github.mariotaku.ObjectCursor:core:${sharedVersions['ObjectCursor']}" kapt "com.github.mariotaku.ObjectCursor:processor:${sharedVersions['ObjectCursor']}" - implementation 'com.github.mariotaku:PickNCrop:0.9.27' + implementation 'com.github.mariotaku:PickNCrop:0.9.29' implementation "com.github.mariotaku.RestFu:library:${sharedVersions['RestFu']}" implementation "com.github.mariotaku.RestFu:logansquare:${sharedVersions['RestFu']}" implementation "com.github.mariotaku.RestFu:oauth:${sharedVersions['RestFu']}" implementation "com.github.mariotaku.RestFu:oauth2:${sharedVersions['RestFu']}" implementation "com.github.mariotaku.RestFu:okhttp3:${sharedVersions['RestFu']}" implementation 'com.github.mariotaku:SQLiteQB:0.9.15' - implementation 'com.github.mariotaku.UniqR:android:0.9.4' + implementation 'com.github.mariotaku.UniqR:android:0.9.10' implementation 'com.github.Tlaster:Chameleon:0.9.28' @@ -292,9 +291,10 @@ dependencies { if (enableGoogleVariant) { // START Non-FOSS component - googleImplementation "com.google.android.gms:play-services-ads:${libVersions['PlayServices']}" - googleImplementation "com.google.android.gms:play-services-auth:${libVersions['PlayServices']}" - googleImplementation "com.google.android.gms:play-services-maps:${libVersions['PlayServices']}" + googleImplementation 'com.google.android.gms:play-services-ads:17.0.0' + googleImplementation 'com.google.android.gms:play-services-auth:17.0.0' + googleImplementation 'com.google.android.gms:play-services-maps:17.0.0' + googleImplementation 'com.google.maps.android:android-maps-utils:0.6.2' googleImplementation 'com.anjlab.android.iab.v3:library:1.1.0' googleImplementation 'com.dropbox.core:dropbox-core-sdk:3.1.3' From 432924834a64b3ad5e2e25f54f6de6fc858bb69a Mon Sep 17 00:00:00 2001 From: Terence Eden Date: Mon, 29 Jun 2020 14:48:21 +0100 Subject: [PATCH 10/29] Alt text input acts as a normal text box Fixes #1326 --- twidere/src/main/res/layout/dialog_compose_edit_alt_text.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/twidere/src/main/res/layout/dialog_compose_edit_alt_text.xml b/twidere/src/main/res/layout/dialog_compose_edit_alt_text.xml index 9bd60f8e5..f3e2fc23f 100644 --- a/twidere/src/main/res/layout/dialog_compose_edit_alt_text.xml +++ b/twidere/src/main/res/layout/dialog_compose_edit_alt_text.xml @@ -11,7 +11,7 @@ android:id="@+id/editText" android:layout_width="match_parent" android:layout_height="wrap_content" - android:inputType="text" + android:inputType="textMultiLine|textLongMessage|textCapSentences" app:backgroundTint="?colorControlStateful"/> - \ No newline at end of file + From 4b2aba0266ff0deae4dd9284765457172c719e8e Mon Sep 17 00:00:00 2001 From: TacoTheDank Date: Tue, 14 Jul 2020 16:46:57 -0400 Subject: [PATCH 11/29] Update DNSJava and Exoplayer again --- twidere/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/twidere/build.gradle b/twidere/build.gradle index a63f6adbd..e63e8dd14 100644 --- a/twidere/build.gradle +++ b/twidere/build.gradle @@ -176,7 +176,7 @@ ext { Kovenant : '3.3.0', Mime4J : '0.7.2', Dagger : '2.28.1', - Exoplayer : '2.11.6', + Exoplayer : '2.11.7', Glide : '4.11.0', MediaViewerLibrary: '0.9.23', Stetho : '1.5.1', @@ -218,7 +218,7 @@ dependencies { implementation 'com.twitter.twittertext:twitter-text:3.1.0' implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.10.0' implementation 'com.squareup:otto:1.3.8' - implementation 'dnsjava:dnsjava:3.2.1' + implementation 'dnsjava:dnsjava:3.2.2' implementation 'com.commonsware.cwac:layouts:0.4.5' implementation 'com.rengwuxian.materialedittext:library:2.1.4' implementation 'com.pnikosis:materialish-progress:1.7' From 3853ed1f0b9e9da7be44f42481222ecac2d62344 Mon Sep 17 00:00:00 2001 From: PotcFdk Date: Sat, 25 Jul 2020 16:09:03 +0200 Subject: [PATCH 12/29] Increase the max user profile name length to 50. --- twidere/src/main/res/layout/fragment_user_profile_editor.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/twidere/src/main/res/layout/fragment_user_profile_editor.xml b/twidere/src/main/res/layout/fragment_user_profile_editor.xml index 5bcaa3763..50b856aed 100644 --- a/twidere/src/main/res/layout/fragment_user_profile_editor.xml +++ b/twidere/src/main/res/layout/fragment_user_profile_editor.xml @@ -160,7 +160,7 @@ app:met_baseColor="?android:textColorPrimary" app:met_floatingLabel="normal" app:met_floatingLabelText="@string/user_profile_name" - app:met_maxCharacters="20" + app:met_maxCharacters="50" app:met_primaryColor="?colorAccent" tools:text="TwidereProject"/> From 64c93b3ed9c42a78c1644533a7ac7cbe525f0ecf Mon Sep 17 00:00:00 2001 From: Falih Mulyana Date: Fri, 28 Aug 2020 23:36:18 +0700 Subject: [PATCH 13/29] Add custom text selection action to compose tweet from selected text --- twidere/src/main/AndroidManifest.xml | 7 +++++++ .../org/mariotaku/twidere/activity/ComposeActivity.kt | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/twidere/src/main/AndroidManifest.xml b/twidere/src/main/AndroidManifest.xml index 9f717cd89..c310bf191 100644 --- a/twidere/src/main/AndroidManifest.xml +++ b/twidere/src/main/AndroidManifest.xml @@ -249,6 +249,13 @@ + + + + + + + = Build.VERSION_CODES.M){ + val charSequences = intent.getCharSequenceExtra(Intent.EXTRA_PROCESS_TEXT) + charSequences?.let { + editText.setText(it.toString()) + } + } editText.requestFocus() return true } From 20f03c002c67fdd41272742c10dd85d983c81034 Mon Sep 17 00:00:00 2001 From: HugoPoi Date: Sun, 27 Sep 2020 14:17:23 +0200 Subject: [PATCH 14/29] feat: KEY_CONNECTION_TIMEOUT set read write timeouts too --- .../kotlin/org/mariotaku/twidere/util/HttpClientFactory.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/HttpClientFactory.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/HttpClientFactory.kt index 48b2f1282..67c507d26 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/HttpClientFactory.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/HttpClientFactory.kt @@ -190,8 +190,8 @@ object HttpClientFactory { class HttpClientConfiguration(val prefs: SharedPreferences) { - var readTimeoutSecs: Long = -1 - var writeTimeoutSecs: Long = -1 + var readTimeoutSecs: Long = prefs.getInt(KEY_CONNECTION_TIMEOUT, 10).toLong() + var writeTimeoutSecs: Long = prefs.getInt(KEY_CONNECTION_TIMEOUT, 10).toLong() var connectionTimeoutSecs: Long = prefs.getInt(KEY_CONNECTION_TIMEOUT, 10).toLong() var cacheSize: Int = prefs[cacheSizeLimitKey] From f054752c6543cf4ea36790445210fd6f6f20b187 Mon Sep 17 00:00:00 2001 From: Tlaster Date: Sat, 28 Nov 2020 21:20:18 +0800 Subject: [PATCH 15/29] fix translate crash --- .../twidere/fragment/status/StatusFragment.kt | 15 +++++++++++---- .../main/kotlin/org/mariotaku/yandex/YandexAPI.kt | 1 + 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/StatusFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/StatusFragment.kt index eea9202aa..40d29eb78 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/StatusFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/StatusFragment.kt @@ -73,6 +73,7 @@ import org.mariotaku.twidere.constant.KeyboardShortcutConstants.* import org.mariotaku.twidere.constant.displaySensitiveContentsKey import org.mariotaku.twidere.constant.newDocumentApiKey import org.mariotaku.twidere.constant.yandexKeyKey +import org.mariotaku.twidere.exception.AccountNotFoundException import org.mariotaku.twidere.extension.* import org.mariotaku.twidere.extension.model.* import org.mariotaku.twidere.extension.model.api.key @@ -94,7 +95,7 @@ import org.mariotaku.twidere.model.pagination.SinceMaxPagination import org.mariotaku.twidere.model.util.AccountUtils import org.mariotaku.twidere.provider.TwidereDataStore.CachedStatuses import org.mariotaku.twidere.provider.TwidereDataStore.Statuses -import org.mariotaku.twidere.task.AbsAccountRequestTask +import org.mariotaku.twidere.task.ExceptionHandlingAbstractTask import org.mariotaku.twidere.util.* import org.mariotaku.twidere.util.ContentScrollHandler.ContentListSupport import org.mariotaku.twidere.util.KeyboardShortcutsHandler.KeyboardShortcutCallback @@ -107,6 +108,7 @@ import org.mariotaku.twidere.view.holder.StatusViewHolder import org.mariotaku.twidere.view.holder.iface.IStatusViewHolder import org.mariotaku.twidere.view.holder.iface.IStatusViewHolder.StatusClickListener import org.mariotaku.yandex.YandexAPIFactory +import org.mariotaku.yandex.YandexException import java.lang.ref.WeakReference import kotlin.math.max import kotlin.math.min @@ -687,11 +689,14 @@ class StatusFragment : BaseFragment(), LoaderCallbacks(fragment.requireContext(), status.account_key) { + ExceptionHandlingAbstractTask(fragment.requireContext()) { private val weakFragment = WeakReference(fragment) - override fun onExecute(account: AccountDetails, params: Any?): TranslationResult { + override fun onExecute(params: Any?): TranslationResult { + val am = AccountManager.get(context) + val account = status.account_key?.let { AccountUtils.getAccountDetails(am, it, true) } ?: + throw AccountNotFoundException() val prefDest = preferences.getString(KEY_TRANSLATION_DESTINATION, null).orEmpty() val twitter = account.newMicroBlogInstance(context, MicroBlog::class.java) val dest: String @@ -725,9 +730,11 @@ class StatusFragment : BaseFragment(), LoaderCallbacks Date: Sat, 28 Nov 2020 21:21:15 +0800 Subject: [PATCH 16/29] version 4.1.5 --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 1d533ccb6..31a4a9610 100644 --- a/build.gradle +++ b/build.gradle @@ -17,8 +17,8 @@ buildscript { allprojects { ext { projectGroupId = 'org.mariotaku.twidere' - projectVersionCode = 513 - projectVersionName = '4.1.4' + projectVersionCode = 514 + projectVersionName = '4.1.5' globalCompileSdkVersion = 29 globalBuildToolsVersion = "29.0.3" From fbaf027ce4b11c889219d51b74584ba31bc7e89b Mon Sep 17 00:00:00 2001 From: Tlaster Date: Mon, 30 Nov 2020 13:16:36 +0800 Subject: [PATCH 17/29] upgrade .google.commit-id --- twidere/src/.google.commit-id | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/twidere/src/.google.commit-id b/twidere/src/.google.commit-id index cd4e9bd24..1f325bb25 100644 --- a/twidere/src/.google.commit-id +++ b/twidere/src/.google.commit-id @@ -1 +1 @@ -e7e073e91e9088ca273f8618bf97e4e10f44b42c +96c25a55cbb957eb9994154ca2f23cd036f4ddaf From 75c5c09ba63d98cda484693cb673a0f616a76c8f Mon Sep 17 00:00:00 2001 From: Tlaster Date: Tue, 1 Dec 2020 14:35:47 +0800 Subject: [PATCH 18/29] fix crash when launching --- .../org/mariotaku/twidere/util/support/ActivitySupport.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/support/ActivitySupport.java b/twidere/src/main/java/org/mariotaku/twidere/util/support/ActivitySupport.java index 860eb13ff..84bbf6bd2 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/util/support/ActivitySupport.java +++ b/twidere/src/main/java/org/mariotaku/twidere/util/support/ActivitySupport.java @@ -45,7 +45,11 @@ public class ActivitySupport { } private static TaskDescription toNativeTaskDescription(TaskDescriptionCompat taskDescription) { - return new TaskDescription(taskDescription.getLabel(), taskDescription.getPrimaryColor()); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) { + return new TaskDescription(taskDescription.getLabel(), taskDescription.getPrimaryColor()); + } else { + return new TaskDescription(taskDescription.getLabel(), taskDescription.getIcon(), taskDescription.getPrimaryColor()); + } } } From dc144f068e12c4edeccd971c6cf95b6b8f961152 Mon Sep 17 00:00:00 2001 From: Tlaster Date: Tue, 1 Dec 2020 14:37:56 +0800 Subject: [PATCH 19/29] version 4.1.6 --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 31a4a9610..ba4affe65 100644 --- a/build.gradle +++ b/build.gradle @@ -17,8 +17,8 @@ buildscript { allprojects { ext { projectGroupId = 'org.mariotaku.twidere' - projectVersionCode = 514 - projectVersionName = '4.1.5' + projectVersionCode = 515 + projectVersionName = '4.1.6' globalCompileSdkVersion = 29 globalBuildToolsVersion = "29.0.3" From 4729c02ea9ea0cd8806aba662911e4695752fed0 Mon Sep 17 00:00:00 2001 From: TacoTheDank Date: Mon, 8 Jun 2020 16:04:49 -0400 Subject: [PATCH 20/29] Revert "Move Yandex to Kotlin directory" This reverts commit c30e8b4da8929667eed3506aacc007c2163c29c1. --- .../src/main/{kotlin => java}/org/mariotaku/yandex/YandexAPI.kt | 0 .../{kotlin => java}/org/mariotaku/yandex/YandexAPIFactory.kt | 0 .../main/{kotlin => java}/org/mariotaku/yandex/YandexException.kt | 0 .../org/mariotaku/yandex/model/YandexTranslateResult.kt | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename twidere/src/main/{kotlin => java}/org/mariotaku/yandex/YandexAPI.kt (100%) rename twidere/src/main/{kotlin => java}/org/mariotaku/yandex/YandexAPIFactory.kt (100%) rename twidere/src/main/{kotlin => java}/org/mariotaku/yandex/YandexException.kt (100%) rename twidere/src/main/{kotlin => java}/org/mariotaku/yandex/model/YandexTranslateResult.kt (100%) diff --git a/twidere/src/main/kotlin/org/mariotaku/yandex/YandexAPI.kt b/twidere/src/main/java/org/mariotaku/yandex/YandexAPI.kt similarity index 100% rename from twidere/src/main/kotlin/org/mariotaku/yandex/YandexAPI.kt rename to twidere/src/main/java/org/mariotaku/yandex/YandexAPI.kt diff --git a/twidere/src/main/kotlin/org/mariotaku/yandex/YandexAPIFactory.kt b/twidere/src/main/java/org/mariotaku/yandex/YandexAPIFactory.kt similarity index 100% rename from twidere/src/main/kotlin/org/mariotaku/yandex/YandexAPIFactory.kt rename to twidere/src/main/java/org/mariotaku/yandex/YandexAPIFactory.kt diff --git a/twidere/src/main/kotlin/org/mariotaku/yandex/YandexException.kt b/twidere/src/main/java/org/mariotaku/yandex/YandexException.kt similarity index 100% rename from twidere/src/main/kotlin/org/mariotaku/yandex/YandexException.kt rename to twidere/src/main/java/org/mariotaku/yandex/YandexException.kt diff --git a/twidere/src/main/kotlin/org/mariotaku/yandex/model/YandexTranslateResult.kt b/twidere/src/main/java/org/mariotaku/yandex/model/YandexTranslateResult.kt similarity index 100% rename from twidere/src/main/kotlin/org/mariotaku/yandex/model/YandexTranslateResult.kt rename to twidere/src/main/java/org/mariotaku/yandex/model/YandexTranslateResult.kt From 4f137ad827b0f0bb88c5abf0f80f54b40afd198e Mon Sep 17 00:00:00 2001 From: Tlaster Date: Sat, 28 Nov 2020 21:20:18 +0800 Subject: [PATCH 21/29] Revert "fix translate crash" This reverts commit f054752c6543cf4ea36790445210fd6f6f20b187. --- .../main/java/org/mariotaku/yandex/YandexAPI.kt | 1 - .../twidere/fragment/status/StatusFragment.kt | 15 ++++----------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/twidere/src/main/java/org/mariotaku/yandex/YandexAPI.kt b/twidere/src/main/java/org/mariotaku/yandex/YandexAPI.kt index 7154cbff3..e5401b703 100644 --- a/twidere/src/main/java/org/mariotaku/yandex/YandexAPI.kt +++ b/twidere/src/main/java/org/mariotaku/yandex/YandexAPI.kt @@ -6,7 +6,6 @@ import org.mariotaku.yandex.model.YandexTranslateResult interface YandexAPI { @POST("/api/v1.5/tr.json/translate") - @Throws(YandexException::class) fun search(@Query("text") text: String, @Query("lang") lang: String): YandexTranslateResult } \ No newline at end of file diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/StatusFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/StatusFragment.kt index 40d29eb78..eea9202aa 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/StatusFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/StatusFragment.kt @@ -73,7 +73,6 @@ import org.mariotaku.twidere.constant.KeyboardShortcutConstants.* import org.mariotaku.twidere.constant.displaySensitiveContentsKey import org.mariotaku.twidere.constant.newDocumentApiKey import org.mariotaku.twidere.constant.yandexKeyKey -import org.mariotaku.twidere.exception.AccountNotFoundException import org.mariotaku.twidere.extension.* import org.mariotaku.twidere.extension.model.* import org.mariotaku.twidere.extension.model.api.key @@ -95,7 +94,7 @@ import org.mariotaku.twidere.model.pagination.SinceMaxPagination import org.mariotaku.twidere.model.util.AccountUtils import org.mariotaku.twidere.provider.TwidereDataStore.CachedStatuses import org.mariotaku.twidere.provider.TwidereDataStore.Statuses -import org.mariotaku.twidere.task.ExceptionHandlingAbstractTask +import org.mariotaku.twidere.task.AbsAccountRequestTask import org.mariotaku.twidere.util.* import org.mariotaku.twidere.util.ContentScrollHandler.ContentListSupport import org.mariotaku.twidere.util.KeyboardShortcutsHandler.KeyboardShortcutCallback @@ -108,7 +107,6 @@ import org.mariotaku.twidere.view.holder.StatusViewHolder import org.mariotaku.twidere.view.holder.iface.IStatusViewHolder import org.mariotaku.twidere.view.holder.iface.IStatusViewHolder.StatusClickListener import org.mariotaku.yandex.YandexAPIFactory -import org.mariotaku.yandex.YandexException import java.lang.ref.WeakReference import kotlin.math.max import kotlin.math.min @@ -689,14 +687,11 @@ class StatusFragment : BaseFragment(), LoaderCallbacks(fragment.requireContext()) { + AbsAccountRequestTask(fragment.requireContext(), status.account_key) { private val weakFragment = WeakReference(fragment) - override fun onExecute(params: Any?): TranslationResult { - val am = AccountManager.get(context) - val account = status.account_key?.let { AccountUtils.getAccountDetails(am, it, true) } ?: - throw AccountNotFoundException() + override fun onExecute(account: AccountDetails, params: Any?): TranslationResult { val prefDest = preferences.getString(KEY_TRANSLATION_DESTINATION, null).orEmpty() val twitter = account.newMicroBlogInstance(context, MicroBlog::class.java) val dest: String @@ -730,11 +725,9 @@ class StatusFragment : BaseFragment(), LoaderCallbacks Date: Tue, 22 Dec 2020 17:05:12 +0800 Subject: [PATCH 22/29] Revert "Add yandex translate support" This reverts commit 0fc88a40766aece8e17a314309de7b244d870961. --- .../mariotaku/twidere/TwidereConstants.java | 2 - .../constant/SharedPreferenceConstants.java | 2 - .../java/org/mariotaku/yandex/YandexAPI.kt | 11 ---- .../org/mariotaku/yandex/YandexAPIFactory.kt | 50 ------------------- .../org/mariotaku/yandex/YandexException.kt | 8 --- .../yandex/model/YandexTranslateResult.kt | 14 ------ .../twidere/constant/PreferenceKeys.kt | 2 - .../twidere/fragment/status/StatusFragment.kt | 34 ++++--------- .../holder/status/DetailStatusViewHolder.kt | 16 +++--- twidere/src/main/res/values/strings.xml | 2 - .../res/xml/preferences_advanced_network.xml | 6 --- 11 files changed, 17 insertions(+), 130 deletions(-) delete mode 100644 twidere/src/main/java/org/mariotaku/yandex/YandexAPI.kt delete mode 100644 twidere/src/main/java/org/mariotaku/yandex/YandexAPIFactory.kt delete mode 100644 twidere/src/main/java/org/mariotaku/yandex/YandexException.kt delete mode 100644 twidere/src/main/java/org/mariotaku/yandex/model/YandexTranslateResult.kt diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/TwidereConstants.java b/twidere.component.common/src/main/java/org/mariotaku/twidere/TwidereConstants.java index 798908478..7eaf7ad44 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/TwidereConstants.java +++ b/twidere.component.common/src/main/java/org/mariotaku/twidere/TwidereConstants.java @@ -67,8 +67,6 @@ public interface TwidereConstants extends SharedPreferenceConstants, IntentConst String TWITTER_CONSUMER_KEY = "MUUBibXUognm6e9vbzrUIqPkt"; String TWITTER_CONSUMER_SECRET = "l2uWAgQkoHvDfM2PrRFx2WN4h7QIUIktmxyeTAqRo6TkGCtNKy"; - String YANDEX_KEY = "trnsl.1.1.20200513T065609Z.8e72845b632aa04f.fe1297e42c152de9e8773e1bc71162b1e498e2a8"; - String DEFAULT_TWITTER_API_URL_FORMAT = "https://[DOMAIN].twitter.com/"; String SCHEME_HTTP = "http"; diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/constant/SharedPreferenceConstants.java b/twidere.component.common/src/main/java/org/mariotaku/twidere/constant/SharedPreferenceConstants.java index 5cc0c2d2e..d1e656ba7 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/constant/SharedPreferenceConstants.java +++ b/twidere.component.common/src/main/java/org/mariotaku/twidere/constant/SharedPreferenceConstants.java @@ -285,8 +285,6 @@ public interface SharedPreferenceConstants { String KEY_OVERRIDE_LANGUAGE = "override_language"; @ExportablePreference(STRING) String KEY_TAB_POSITION = "tab_position"; - @ExportablePreference(STRING) - String KEY_YANDEX_KEY = "yandex_key"; @ExportablePreference(BOOLEAN) String KEY_AUTO_HIDE_TABS = "auto_hide_tabs"; @ExportablePreference(BOOLEAN) diff --git a/twidere/src/main/java/org/mariotaku/yandex/YandexAPI.kt b/twidere/src/main/java/org/mariotaku/yandex/YandexAPI.kt deleted file mode 100644 index e5401b703..000000000 --- a/twidere/src/main/java/org/mariotaku/yandex/YandexAPI.kt +++ /dev/null @@ -1,11 +0,0 @@ -package org.mariotaku.yandex - -import org.mariotaku.restfu.annotation.method.POST -import org.mariotaku.restfu.annotation.param.Query -import org.mariotaku.yandex.model.YandexTranslateResult - -interface YandexAPI { - @POST("/api/v1.5/tr.json/translate") - fun search(@Query("text") text: String, - @Query("lang") lang: String): YandexTranslateResult -} \ No newline at end of file diff --git a/twidere/src/main/java/org/mariotaku/yandex/YandexAPIFactory.kt b/twidere/src/main/java/org/mariotaku/yandex/YandexAPIFactory.kt deleted file mode 100644 index 2d05e5d37..000000000 --- a/twidere/src/main/java/org/mariotaku/yandex/YandexAPIFactory.kt +++ /dev/null @@ -1,50 +0,0 @@ -package org.mariotaku.yandex - -import org.mariotaku.restfu.RestAPIFactory -import org.mariotaku.restfu.RestConverter -import org.mariotaku.restfu.RestMethod -import org.mariotaku.restfu.RestRequest -import org.mariotaku.restfu.http.Endpoint -import org.mariotaku.restfu.http.RestHttpClient -import org.mariotaku.restfu.http.ValueMap -import org.mariotaku.restfu.logansqaure.LoganSquareConverterFactory - - -class YandexAPIFactory(apiKey: String, endpoint: String) { - private val factory: RestAPIFactory = RestAPIFactory() - - init { - factory.setEndpoint(Endpoint(endpoint)) - factory.setExceptionFactory { cause, _, _ -> - cause?.let { YandexException(it) } - ?: YandexException() - } - factory.setRestConverterFactory(LoganSquareConverterFactory()) - factory.setRestRequestFactory(object : RestRequest.DefaultFactory() { - override fun create(restMethod: RestMethod, - factory: RestConverter.Factory, valuePool: ValueMap?): RestRequest { - val method = restMethod.method - val path = restMethod.path - val headers = restMethod.getHeaders(valuePool) - val queries = restMethod.getQueries(valuePool) - val params = restMethod.getParams(factory, valuePool) - val rawValue = restMethod.rawValue - val bodyType = restMethod.bodyType - val extras = restMethod.extras - queries.add("key", apiKey) - return RestRequest(method.value, method.allowBody, path, headers, queries, - params, rawValue, bodyType, extras) - } - }) - } - - fun setHttpClient(restClient: RestHttpClient): YandexAPIFactory { - factory.setHttpClient(restClient) - return this - } - - fun build(): YandexAPI { - return factory.build(YandexAPI::class.java) - } -} - diff --git a/twidere/src/main/java/org/mariotaku/yandex/YandexException.kt b/twidere/src/main/java/org/mariotaku/yandex/YandexException.kt deleted file mode 100644 index f4285db76..000000000 --- a/twidere/src/main/java/org/mariotaku/yandex/YandexException.kt +++ /dev/null @@ -1,8 +0,0 @@ -package org.mariotaku.yandex - -class YandexException : Exception { - constructor() : super() - constructor(message: String?) : super(message) - constructor(message: String?, cause: Throwable?) : super(message, cause) - constructor(cause: Throwable?) : super(cause) -} \ No newline at end of file diff --git a/twidere/src/main/java/org/mariotaku/yandex/model/YandexTranslateResult.kt b/twidere/src/main/java/org/mariotaku/yandex/model/YandexTranslateResult.kt deleted file mode 100644 index 32b6f27bc..000000000 --- a/twidere/src/main/java/org/mariotaku/yandex/model/YandexTranslateResult.kt +++ /dev/null @@ -1,14 +0,0 @@ -package org.mariotaku.yandex.model - -import com.bluelinelabs.logansquare.annotation.JsonField -import com.bluelinelabs.logansquare.annotation.JsonObject - -@JsonObject -data class YandexTranslateResult( - @JsonField(name = ["code"]) - var code: Int? = null, - @JsonField(name = ["lang"]) - var lang: String? = null, - @JsonField(name = ["text"]) - var text: List? = null -) \ No newline at end of file diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/constant/PreferenceKeys.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/constant/PreferenceKeys.kt index 92a480336..132ebba64 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/constant/PreferenceKeys.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/constant/PreferenceKeys.kt @@ -10,7 +10,6 @@ import org.mariotaku.ktextension.bcp47Tag import org.mariotaku.ktextension.toLongOr import org.mariotaku.twidere.BuildConfig import org.mariotaku.twidere.Constants.* -import org.mariotaku.twidere.TwidereConstants import org.mariotaku.twidere.TwidereConstants.KEY_MEDIA_PRELOAD import org.mariotaku.twidere.annotation.AccountType import org.mariotaku.twidere.annotation.ImageShapeStyle @@ -87,7 +86,6 @@ val lastLaunchTimeKey = KLongKey("last_launch_time", -1) val promotionsEnabledKey = KBooleanKey("promotions_enabled", false) val translationDestinationKey = KNullableStringKey(KEY_TRANSLATION_DESTINATION, null) val tabPositionKey = KStringKey(KEY_TAB_POSITION, SharedPreferenceConstants.DEFAULT_TAB_POSITION) -val yandexKeyKey = KStringKey(SharedPreferenceConstants.KEY_YANDEX_KEY, TwidereConstants.YANDEX_KEY) val autoHideTabs = KBooleanKey(SharedPreferenceConstants.KEY_AUTO_HIDE_TABS, true) val hideCardNumbersKey = KBooleanKey(KEY_HIDE_CARD_NUMBERS, false) val showLinkPreviewKey = KBooleanKey(KEY_SHOW_LINK_PREVIEW, false) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/StatusFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/StatusFragment.kt index eea9202aa..537b41e0f 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/StatusFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/StatusFragment.kt @@ -32,19 +32,19 @@ import android.nfc.NdefMessage import android.nfc.NdefRecord import android.nfc.NfcAdapter.CreateNdefMessageCallback import android.os.Bundle -import android.text.TextUtils -import android.view.* -import android.widget.Toast -import androidx.appcompat.app.AlertDialog import androidx.loader.app.LoaderManager import androidx.loader.app.LoaderManager.LoaderCallbacks import androidx.loader.app.hasRunningLoadersSafe import androidx.loader.content.FixedAsyncTaskLoader import androidx.loader.content.Loader +import androidx.appcompat.app.AlertDialog import androidx.recyclerview.widget.FixedLinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView.ViewHolder +import android.text.TextUtils +import android.view.* +import android.widget.Toast import com.squareup.otto.Subscribe import kotlinx.android.synthetic.main.fragment_status.* import kotlinx.android.synthetic.main.layout_content_fragment_common.* @@ -72,11 +72,13 @@ import org.mariotaku.twidere.annotation.AccountType import org.mariotaku.twidere.constant.KeyboardShortcutConstants.* import org.mariotaku.twidere.constant.displaySensitiveContentsKey import org.mariotaku.twidere.constant.newDocumentApiKey -import org.mariotaku.twidere.constant.yandexKeyKey import org.mariotaku.twidere.extension.* -import org.mariotaku.twidere.extension.model.* import org.mariotaku.twidere.extension.model.api.key import org.mariotaku.twidere.extension.model.api.toParcelable +import org.mariotaku.twidere.extension.model.getAccountType +import org.mariotaku.twidere.extension.model.media_type +import org.mariotaku.twidere.extension.model.newMicroBlogInstance +import org.mariotaku.twidere.extension.model.originalId import org.mariotaku.twidere.extension.view.calculateSpaceItemHeight import org.mariotaku.twidere.fragment.AbsStatusesFragment import org.mariotaku.twidere.fragment.AbsStatusesFragment.Companion.handleActionClick @@ -99,14 +101,12 @@ import org.mariotaku.twidere.util.* import org.mariotaku.twidere.util.ContentScrollHandler.ContentListSupport import org.mariotaku.twidere.util.KeyboardShortcutsHandler.KeyboardShortcutCallback import org.mariotaku.twidere.util.RecyclerViewScrollHandler.RecyclerViewCallback -import org.mariotaku.twidere.util.dagger.DependencyHolder import org.mariotaku.twidere.view.CardMediaContainer.OnMediaClickListener import org.mariotaku.twidere.view.ExtendedRecyclerView import org.mariotaku.twidere.view.holder.GapViewHolder import org.mariotaku.twidere.view.holder.StatusViewHolder import org.mariotaku.twidere.view.holder.iface.IStatusViewHolder import org.mariotaku.twidere.view.holder.iface.IStatusViewHolder.StatusClickListener -import org.mariotaku.yandex.YandexAPIFactory import java.lang.ref.WeakReference import kotlin.math.max import kotlin.math.min @@ -692,8 +692,8 @@ class StatusFragment : BaseFragment(), LoaderCallbacksDNS Server Set DNS Server for network requests. - Yandex Api Key - Draft saved Your unsent tweets will save here diff --git a/twidere/src/main/res/xml/preferences_advanced_network.xml b/twidere/src/main/res/xml/preferences_advanced_network.xml index d1e13bb70..a8515683d 100644 --- a/twidere/src/main/res/xml/preferences_advanced_network.xml +++ b/twidere/src/main/res/xml/preferences_advanced_network.xml @@ -36,12 +36,6 @@ android:summary="@string/custom_host_mapping_summary" android:title="@string/custom_host_mapping"/> - - From e325e886ac0268f904c08ac3a31d0f60748617e8 Mon Sep 17 00:00:00 2001 From: Tlaster Date: Tue, 22 Dec 2020 17:14:57 +0800 Subject: [PATCH 23/29] fix build --- .../twidere/view/holder/status/DetailStatusViewHolder.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/status/DetailStatusViewHolder.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/status/DetailStatusViewHolder.kt index 6feba0b00..a1387ae5c 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/status/DetailStatusViewHolder.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/status/DetailStatusViewHolder.kt @@ -22,6 +22,7 @@ package org.mariotaku.twidere.view.holder.status import android.content.Context import android.content.SharedPreferences import android.graphics.Rect +import android.net.Uri import androidx.annotation.UiThread import androidx.core.content.ContextCompat import androidx.core.view.ViewCompat @@ -38,6 +39,7 @@ import android.view.LayoutInflater import android.view.MenuItem import android.view.View import android.view.ViewGroup +import androidx.core.view.isVisible import kotlinx.android.synthetic.main.adapter_item_status_count_label.view.* import kotlinx.android.synthetic.main.header_status.view.* import org.mariotaku.abstask.library.TaskStarter From 18e42f86a4110f292107e343cc616a05b56af3e0 Mon Sep 17 00:00:00 2001 From: Tlaster Date: Mon, 1 Mar 2021 13:55:17 +0800 Subject: [PATCH 24/29] upgdate packages and migrate to kotlin 1.4.31 --- build.gradle | 17 +++-- gradle/wrapper/gradle-wrapper.properties | 3 +- twidere.component.nyan/build.gradle | 2 +- twidere/build.gradle | 33 ++++----- .../activity/CrashReportDialogActivity.kt | 11 --- .../mariotaku/twidere/util/ACRAAnalyzer.kt | 22 ++++-- .../mariotaku/ktextension/IntentExtensions.kt | 2 +- .../twidere/activity/BaseActivity.kt | 7 +- .../twidere/activity/BrowserSignInActivity.kt | 2 +- .../twidere/activity/ComposeActivity.kt | 73 ++++++++++--------- .../activity/FragmentContentActivity.kt | 11 ++- .../twidere/activity/HomeActivity.kt | 4 +- .../twidere/activity/ImageCropperActivity.kt | 40 +++++----- ...eyboardShortcutPreferenceCompatActivity.kt | 2 +- .../twidere/activity/SignInActivity.kt | 8 +- .../activity/UserListSelectorActivity.kt | 2 +- .../content/AbsStatusDialogActivity.kt | 4 +- .../AbsExtraFeaturePurchaseActivity.kt | 2 +- ...sUserListRelatedShortcutCreatorActivity.kt | 6 +- .../AbsUserRelatedShortcutCreatorActivity.kt | 6 +- .../twidere/app/TwidereApplication.kt | 2 +- .../ConnectivityManagerExtensions.kt | 2 +- .../fragment/AccountsManagerFragment.kt | 2 +- .../twidere/fragment/BaseWebViewFragment.kt | 2 +- .../twidere/fragment/UserListFragment.kt | 2 +- .../fragment/filter/FilteredUsersFragment.kt | 4 +- .../media/ExternalBrowserPageFragment.kt | 5 +- .../MessageConversationInfoFragment.kt | 15 ++-- .../message/MessagesEntriesFragment.kt | 2 +- .../twidere/menu/AccountActionProvider.kt | 7 +- .../model/analyzer/PurchaseFinished.kt | 2 +- .../conf/TrendsLocationExtraConfiguration.kt | 5 +- .../model/tab/conf/UserExtraConfiguration.kt | 11 +-- .../tab/conf/UserListExtraConfiguration.kt | 11 +-- .../twidere/util/MultiSelectEventHandler.kt | 2 +- .../twidere/view/LollipopFixedWebView.kt | 13 ++-- .../layout_media_viewer_exo_player_view.xml | 2 +- 37 files changed, 188 insertions(+), 158 deletions(-) diff --git a/build.gradle b/build.gradle index ba4affe65..1212dc3b1 100644 --- a/build.gradle +++ b/build.gradle @@ -2,13 +2,13 @@ buildscript { repositories { - jcenter() + mavenCentral() maven { url "https://plugins.gradle.org/m2/" } google() } dependencies { - classpath 'com.android.tools.build:gradle:4.0.0' + classpath 'com.android.tools.build:gradle:4.1.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } @@ -20,16 +20,17 @@ allprojects { projectVersionCode = 515 projectVersionName = '4.1.6' - globalCompileSdkVersion = 29 - globalBuildToolsVersion = "29.0.3" + globalCompileSdkVersion = 30 + globalBuildToolsVersion = "30.0.3" globalMinSdkVersion = 16 - globalTargetSdkVersion = 29 + globalTargetSdkVersion = 30 } repositories { mavenLocal() - jcenter() + jcenter()// exoplayer and glide-transformations still using jcenter + mavenCentral() maven { url "https://jitpack.io" } google() } @@ -38,12 +39,12 @@ allprojects { subprojects { buildscript { ext { - kotlinVersion = '1.3.72' + kotlinVersion = '1.4.31' sharedVersions = [ Kotlin : "${kotlinVersion}", LoganSquare : '1.3.7', - Jackson : '2.11.1', + Jackson : '2.12.1', ParcelablePlease : '1.0.2', ExportablePreferences: '0.9.7', diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 21e622da6..c86a4b44f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ +#Mon Mar 01 10:46:00 CST 2021 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip diff --git a/twidere.component.nyan/build.gradle b/twidere.component.nyan/build.gradle index 13f584512..33e43faa4 100644 --- a/twidere.component.nyan/build.gradle +++ b/twidere.component.nyan/build.gradle @@ -38,5 +38,5 @@ android { } dependencies { - implementation 'androidx.core:core:1.3.0' + implementation 'androidx.core:core:1.3.2' } diff --git a/twidere/build.gradle b/twidere/build.gradle index e63e8dd14..b4e496e07 100644 --- a/twidere/build.gradle +++ b/twidere/build.gradle @@ -175,8 +175,8 @@ ext { libVersions = [ Kovenant : '3.3.0', Mime4J : '0.7.2', - Dagger : '2.28.1', - Exoplayer : '2.11.7', + Dagger : '2.32', + Exoplayer : '2.13.2', Glide : '4.11.0', MediaViewerLibrary: '0.9.23', Stetho : '1.5.1', @@ -197,20 +197,18 @@ dependencies { /** Android support **/ implementation 'androidx.annotation:annotation:1.1.0' - implementation 'androidx.appcompat:appcompat:1.3.0-alpha01' + implementation 'androidx.appcompat:appcompat:1.3.0-beta01' implementation 'androidx.browser:browser:1.2.0' implementation 'androidx.cardview:cardview:1.0.0' - implementation 'androidx.core:core:1.3.0' - implementation 'androidx.core:core-ktx:1.3.0' - implementation 'androidx.drawerlayout:drawerlayout:1.1.0-alpha01' - implementation 'androidx.exifinterface:exifinterface:1.2.0' + implementation 'androidx.core:core-ktx:1.3.2' + implementation 'androidx.drawerlayout:drawerlayout:1.1.1' + implementation 'androidx.exifinterface:exifinterface:1.3.1' implementation 'androidx.legacy:legacy-support-core-ui:1.0.0' implementation 'androidx.multidex:multidex:2.0.1' implementation 'androidx.palette:palette-ktx:1.0.0' - implementation 'androidx.preference:preference:1.1.1' implementation 'androidx.preference:preference-ktx:1.1.1' implementation 'androidx.recyclerview:recyclerview:1.1.0' - implementation 'com.google.android.material:material:1.1.0' + implementation 'com.google.android.material:material:1.3.0' /** Third-party dependencies **/ @@ -236,7 +234,7 @@ dependencies { implementation "com.hannesdorfmann.parcelableplease:annotation:${sharedVersions['ParcelablePlease']}" kapt "com.hannesdorfmann.parcelableplease:processor:${sharedVersions['ParcelablePlease']}" implementation 'com.squareup.okhttp3:okhttp:3.12.12' - implementation 'com.squareup.okio:okio:2.6.0' + implementation 'com.squareup.okio:okio:2.9.0' implementation 'com.lnikkila:extendedtouchview:0.1.1' implementation "com.google.dagger:dagger:${libVersions['Dagger']}" kapt "com.google.dagger:dagger-compiler:${libVersions['Dagger']}" @@ -244,8 +242,8 @@ dependencies { implementation 'com.getkeepsafe.taptargetview:taptargetview:1.13.0' implementation 'net.ypresto.androidtranscoder:android-transcoder:0.3.0' implementation 'org.jsoup:jsoup:1.13.1' - implementation "com.google.android.exoplayer:exoplayer-core:${libVersions['Exoplayer']}" - implementation "com.google.android.exoplayer:exoplayer-ui:${libVersions['Exoplayer']}" + implementation "com.google.android.exoplayer:exoplayer:${libVersions['Exoplayer']}" +// implementation "com.google.android.exoplayer:exoplayer-ui:${libVersions['Exoplayer']}" implementation "com.google.android.exoplayer:extension-okhttp:${libVersions['Exoplayer']}" implementation "com.github.bumptech.glide:glide:${libVersions['Glide']}" implementation "com.github.bumptech.glide:okhttp3-integration:${libVersions['Glide']}@aar" @@ -287,7 +285,8 @@ dependencies { /** Flavor dependencies **/ fdroidImplementation 'org.osmdroid:osmdroid-android:5.6.5' - fdroidImplementation 'ch.acra:acra:4.11' + fdroidImplementation 'ch.acra:acra-mail:5.7.0' + fdroidImplementation 'ch.acra:acra-dialog:5.7.0' if (enableGoogleVariant) { // START Non-FOSS component @@ -308,7 +307,7 @@ dependencies { debugImplementation "com.facebook.stetho:stetho:${libVersions['Stetho']}" debugImplementation "com.facebook.stetho:stetho-okhttp3:${libVersions['Stetho']}" debugImplementation 'com.github.mariotaku:StethoBeanShellREPL:0.5' - debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.3' + debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.6' debugImplementation('com.jayway.jsonpath:json-path:2.4.0') { exclude group: 'net.minidev', module: 'json-smart' } @@ -317,10 +316,10 @@ dependencies { /** Testing **/ - testImplementation 'junit:junit:4.13' + testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.annotation:annotation:1.1.0' - androidTestImplementation 'androidx.test.ext:junit:1.1.1' - androidTestImplementation 'androidx.test:rules:1.2.0' + androidTestImplementation 'androidx.test.ext:junit:1.1.2' + androidTestImplementation 'androidx.test:rules:1.3.0' // https://g.co/androidstudio/app-test-app-conflict androidTestImplementation 'com.google.code.findbugs:jsr305:3.0.2' } diff --git a/twidere/src/fdroid/kotlin/org/mariotaku/twidere/activity/CrashReportDialogActivity.kt b/twidere/src/fdroid/kotlin/org/mariotaku/twidere/activity/CrashReportDialogActivity.kt index f67f98272..aa2fe4510 100644 --- a/twidere/src/fdroid/kotlin/org/mariotaku/twidere/activity/CrashReportDialogActivity.kt +++ b/twidere/src/fdroid/kotlin/org/mariotaku/twidere/activity/CrashReportDialogActivity.kt @@ -38,15 +38,4 @@ class CrashReportDialogActivity : CrashReportDialog() { view.setPadding(padding, padding, padding, padding) return view } - - override fun getMainView(): View { - val text = TextView(this) - TextViewCompat.setTextAppearance(text, android.R.style.TextAppearance_DeviceDefault_Medium) - val dialogTextId = this.config.resDialogText() - if (dialogTextId != 0) { - text.text = this.getText(dialogTextId) - } - return text - } - } diff --git a/twidere/src/fdroid/kotlin/org/mariotaku/twidere/util/ACRAAnalyzer.kt b/twidere/src/fdroid/kotlin/org/mariotaku/twidere/util/ACRAAnalyzer.kt index 27e9353d5..4b83daaf7 100644 --- a/twidere/src/fdroid/kotlin/org/mariotaku/twidere/util/ACRAAnalyzer.kt +++ b/twidere/src/fdroid/kotlin/org/mariotaku/twidere/util/ACRAAnalyzer.kt @@ -27,8 +27,10 @@ import android.app.Application import android.content.SharedPreferences import android.os.Build import org.acra.ACRA -import org.acra.ReportingInteractionMode -import org.acra.config.ConfigurationBuilder +import org.acra.config.CoreConfigurationBuilder +import org.acra.config.DialogConfigurationBuilder +import org.acra.config.MailSenderConfigurationBuilder +import org.acra.data.StringFormat import org.mariotaku.kpreferences.get import org.mariotaku.ktextension.addOnAccountsUpdatedListenerSafe import org.mariotaku.twidere.BuildConfig @@ -40,6 +42,7 @@ import org.mariotaku.twidere.constant.themeBackgroundAlphaKey import org.mariotaku.twidere.constant.themeBackgroundOptionKey import org.mariotaku.twidere.constant.themeKey + /** * Created by mariotaku on 2017/5/8. */ @@ -56,14 +59,17 @@ class ACRAAnalyzer : Analyzer() { } override fun init(application: Application) { - val config = ConfigurationBuilder(application) - .setReportingInteractionMode(ReportingInteractionMode.DIALOG) - .setResDialogText(R.string.message_app_crashed) - .setResDialogTheme(R.style.Theme_Twidere_NoDisplay_DayNight) + val builder = CoreConfigurationBuilder(application) + builder.setBuildConfigClass(BuildConfig::class.java).setReportFormat(StringFormat.JSON) + builder.getPluginConfigurationBuilder(DialogConfigurationBuilder::class.java) + .setResText(R.string.message_app_crashed) + .setResTheme(R.style.Theme_Twidere_NoDisplay_DayNight) .setReportDialogClass(CrashReportDialogActivity::class.java) + .setEnabled(true) + builder.getPluginConfigurationBuilder(MailSenderConfigurationBuilder::class.java) .setMailTo(TWIDERE_PROJECT_EMAIL) - .build() - ACRA.init(application, config) + .setEnabled(true) + ACRA.init(application, builder) val reporter = ACRA.getErrorReporter() reporter.putCustomData("debug", BuildConfig.DEBUG.toString()) reporter.putCustomData("build.brand", Build.BRAND) diff --git a/twidere/src/main/kotlin/org/mariotaku/ktextension/IntentExtensions.kt b/twidere/src/main/kotlin/org/mariotaku/ktextension/IntentExtensions.kt index 24fd51edc..728b8e9f4 100644 --- a/twidere/src/main/kotlin/org/mariotaku/ktextension/IntentExtensions.kt +++ b/twidere/src/main/kotlin/org/mariotaku/ktextension/IntentExtensions.kt @@ -23,7 +23,7 @@ import android.content.Intent import android.os.Parcelable inline fun Intent.getTypedArrayExtra(key: String): Array { - val extra = getParcelableArrayExtra(key) + val extra = getParcelableArrayExtra(key) ?: emptyArray() return Array(extra.size) { extra[it] as T } } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/BaseActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/BaseActivity.kt index bf7e02247..12a0c476e 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/BaseActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/BaseActivity.kt @@ -196,9 +196,10 @@ open class BaseActivity : ChameleonActivity(), IBaseActivity, IThe private set override fun getSystemWindowInsets(caller: Fragment, insets: Rect): Boolean { - if (systemWindowsInsets == null) return false - insets.set(systemWindowsInsets) - return true + return systemWindowsInsets?.let { + insets.set(it) + true + } ?: false } override fun onApplyWindowInsets(v: View, insets: WindowInsetsCompat): WindowInsetsCompat { diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/BrowserSignInActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/BrowserSignInActivity.kt index 98359f2d5..eb78a336f 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/BrowserSignInActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/BrowserSignInActivity.kt @@ -70,7 +70,7 @@ class BrowserSignInActivity : BaseActivity() { setSupportMultipleWindows(true) } - webView.loadUrl(intent.dataString) + intent.dataString?.let { webView.loadUrl(it) } } override fun onDestroy() { 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 d0d557e1f..0bfa3f573 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/ComposeActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/ComposeActivity.kt @@ -124,6 +124,7 @@ class ComposeActivity : BaseActivity(), OnMenuItemClickListener, OnClickListener // Utility classes @Inject lateinit var extractor: Extractor + @Inject lateinit var locationManager: LocationManager @@ -362,7 +363,7 @@ class ComposeActivity : BaseActivity(), OnMenuItemClickListener, OnClickListener statusShortenerUsed = !ComponentPickerPreference.isNoneValue(kPreferences[statusShortenerKey]) if (kPreferences[attachLocationKey]) { if (checkAnySelfPermissionsGranted(AndroidPermission.ACCESS_COARSE_LOCATION, - AndroidPermission.ACCESS_FINE_LOCATION)) { + AndroidPermission.ACCESS_FINE_LOCATION)) { try { startLocationUpdateIfEnabled() } catch (e: SecurityException) { @@ -379,8 +380,8 @@ class ComposeActivity : BaseActivity(), OnMenuItemClickListener, OnClickListener saveAccountSelection() saveVisibility() try { - if (locationListener != null) { - locationManager.removeUpdates(locationListener) + locationListener?.let { + locationManager.removeUpdates(it) locationListener = null } } catch (ignore: SecurityException) { @@ -397,8 +398,8 @@ class ComposeActivity : BaseActivity(), OnMenuItemClickListener, OnClickListener if (resultCode == Activity.RESULT_OK && data != null) { val src = MediaPickerActivity.getMediaUris(data) TaskStarter.execute(AddMediaTask(this, src, null, - copySrc = false, - deleteSrc = false + copySrc = false, + deleteSrc = false )) val extras = data.getBundleExtra(MediaPickerActivity.EXTRA_EXTRAS) if (extras?.getBoolean(EXTRA_IS_POSSIBLY_SENSITIVE) == true) { @@ -417,9 +418,9 @@ class ComposeActivity : BaseActivity(), OnMenuItemClickListener, OnClickListener REQUEST_EXTENSION_COMPOSE -> { if (resultCode == Activity.RESULT_OK && data != null) { // The latter two is for compatibility - val text = data.getCharSequenceExtra(Intent.EXTRA_TEXT) ?: - data.getStringExtra(EXTRA_TEXT) ?: - data.getStringExtra(EXTRA_APPEND_TEXT) + val text = data.getCharSequenceExtra(Intent.EXTRA_TEXT) + ?: data.getStringExtra(EXTRA_TEXT) + ?: data.getStringExtra(EXTRA_APPEND_TEXT) val isReplaceMode = data.getBooleanExtra(EXTRA_IS_REPLACE_MODE, data.getStringExtra(EXTRA_APPEND_TEXT) == null) if (text != null) { @@ -433,12 +434,12 @@ class ComposeActivity : BaseActivity(), OnMenuItemClickListener, OnClickListener updateTextCount() } - val src = MediaPickerActivity.getMediaUris(data)?.takeIf(Array::isNotEmpty) ?: - data.getParcelableExtra(EXTRA_IMAGE_URI)?.let { arrayOf(it) } + val src = MediaPickerActivity.getMediaUris(data)?.takeIf(Array::isNotEmpty) + ?: data.getParcelableExtra(EXTRA_IMAGE_URI)?.let { arrayOf(it) } if (src != null) { TaskStarter.execute(AddMediaTask(this, src, null, - copySrc = false, - deleteSrc = false + copySrc = false, + deleteSrc = false )) } } @@ -618,7 +619,8 @@ class ComposeActivity : BaseActivity(), OnMenuItemClickListener, OnClickListener when (ev.actionMasked) { MotionEvent.ACTION_DOWN -> { if (isAccountSelectorVisible && !TwidereViewUtils.hitView(ev, accountSelectorButton)) { - val layoutManager = accountSelector.layoutManager ?: return super.dispatchTouchEvent(ev) + val layoutManager = accountSelector.layoutManager + ?: return super.dispatchTouchEvent(ev) val clickedItem = (0 until layoutManager.childCount).any { val child = layoutManager.getChildAt(it) child != null && TwidereViewUtils.hitView(ev, child) @@ -786,8 +788,10 @@ class ComposeActivity : BaseActivity(), OnMenuItemClickListener, OnClickListener requestOrUpdateLocation() } else if (locationListener != null) { try { - locationManager.removeUpdates(locationListener) - locationListener = null + locationListener?.let { + locationManager.removeUpdates(it) + locationListener = null + } } catch (e: SecurityException) { //Ignore } @@ -1090,20 +1094,20 @@ class ComposeActivity : BaseActivity(), OnMenuItemClickListener, OnClickListener if (intent == null) return false val action = intent.action val hasVisibility = intent.hasExtra(EXTRA_VISIBILITY) - val hasAccountKeys: Boolean - when { + val hasAccountKeys: Boolean = when { intent.hasExtra(EXTRA_ACCOUNT_KEYS) -> { val accountKeys = intent.getTypedArrayExtra(EXTRA_ACCOUNT_KEYS) accountsAdapter.selectedAccountKeys = accountKeys - hasAccountKeys = true + true } intent.hasExtra(EXTRA_ACCOUNT_KEY) -> { - val accountKey = intent.getParcelableExtra(EXTRA_ACCOUNT_KEY) - accountsAdapter.selectedAccountKeys = arrayOf(accountKey) - hasAccountKeys = true + intent.getParcelableExtra(EXTRA_ACCOUNT_KEY)?.let { + accountsAdapter.selectedAccountKeys = arrayOf(it) + true + } ?: false } else -> { - hasAccountKeys = false + false } } when (action) { @@ -1114,8 +1118,8 @@ class ComposeActivity : BaseActivity(), OnMenuItemClickListener, OnClickListener if (stream != null) { val src = stream.toTypedArray() TaskStarter.execute(AddMediaTask(this, src, null, - copySrc = true, - deleteSrc = false + copySrc = true, + deleteSrc = false )) } } @@ -1126,8 +1130,8 @@ class ComposeActivity : BaseActivity(), OnMenuItemClickListener, OnClickListener if (data != null) { val src = arrayOf(data) TaskStarter.execute(AddMediaTask(this, src, null, - copySrc = true, - deleteSrc = false + copySrc = true, + deleteSrc = false )) } } @@ -1246,7 +1250,7 @@ class ComposeActivity : BaseActivity(), OnMenuItemClickListener, OnClickListener } private fun handleReplyMultipleIntent(screenNames: Array?, accountKey: UserKey?, - inReplyToStatus: ParcelableStatus?): Boolean { + inReplyToStatus: ParcelableStatus?): Boolean { if (screenNames == null || screenNames.isEmpty() || accountKey == null || inReplyToStatus == null) return false val myScreenName = DataStoreUtils.getAccountScreenName(this, accountKey) ?: return false @@ -1444,8 +1448,9 @@ class ComposeActivity : BaseActivity(), OnMenuItemClickListener, OnClickListener val provider = locationManager.getBestProvider(criteria, true) if (provider != null) { locationLabel.setText(R.string.getting_location) - locationListener = ComposeLocationListener(this) - locationManager.requestLocationUpdates(provider, 0, 0f, locationListener) + locationListener = ComposeLocationListener(this).also { + locationManager.requestLocationUpdates(provider, 0, 0f, it) + } val location = locationManager.getCachedLocation() if (location != null) { locationListener?.onLocationChanged(location) @@ -1716,7 +1721,7 @@ class ComposeActivity : BaseActivity(), OnMenuItemClickListener, OnClickListener } private fun getTwitterReplyTextAndMentions(text: String = editText.text?.toString().orEmpty(), - accounts: Array = accountsAdapter.selectedAccounts): ReplyTextAndMentions? { + accounts: Array = accountsAdapter.selectedAccounts): ReplyTextAndMentions? { val inReplyTo = inReplyToStatus ?: return null if (!ignoreMentions) return null val account = accounts.singleOrNull() ?: return null @@ -1841,8 +1846,8 @@ class ComposeActivity : BaseActivity(), OnMenuItemClickListener, OnClickListener editText.customSelectionActionModeCallback = this editText.imageInputListener = { contentInfo -> val task = AddMediaTask(this, arrayOf(contentInfo.contentUri), null, - copySrc = true, - deleteSrc = false + copySrc = true, + deleteSrc = false ) task.callback = { contentInfo.releasePermission() @@ -2083,11 +2088,11 @@ class ComposeActivity : BaseActivity(), OnMenuItemClickListener, OnClickListener } private class AddMediaTask(activity: ComposeActivity, sources: Array, types: IntArray?, - copySrc: Boolean, deleteSrc: Boolean) : AbsAddMediaTask<((List?) -> Unit)?>( + copySrc: Boolean, deleteSrc: Boolean) : AbsAddMediaTask<((List?) -> Unit)?>( activity, sources, types, copySrc, deleteSrc) { override fun afterExecute(callback: ((List?) -> Unit)?, - result: List?) { + result: List?) { callback?.invoke(result) val activity = context as? ComposeActivity ?: return activity.setProgressVisible(false) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/FragmentContentActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/FragmentContentActivity.kt index bba0c1141..cc563af91 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/FragmentContentActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/FragmentContentActivity.kt @@ -11,11 +11,14 @@ class FragmentContentActivity : BaseActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) title = intent.getStringExtra(EXTRA_TITLE) - val fragment = Fragment.instantiate(this, intent.getStringExtra(EXTRA_FRAGMENT), + intent.getStringExtra(EXTRA_FRAGMENT)?.let { + Fragment.instantiate(this, it, intent.getBundleExtra(EXTRA_FRAGMENT_ARGUMENTS)) - val ft = supportFragmentManager.beginTransaction() - ft.replace(android.R.id.content, fragment) - ft.commit() + }?.let { fragment -> + val ft = supportFragmentManager.beginTransaction() + ft.replace(android.R.id.content, fragment) + ft.commit() + } } companion object { diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/HomeActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/HomeActivity.kt index 9211b48de..716310a1e 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/HomeActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/HomeActivity.kt @@ -732,7 +732,9 @@ class HomeActivity : BaseActivity(), OnClickListener, OnPageChangeListener, Supp } else { Utils.getDefaultAccountKey(this) } - IntentUtils.openSearch(this, accountKey, query) + if (query != null) { + IntentUtils.openSearch(this, accountKey, query) + } return -1 } val refreshOnStart = preferences.getBoolean(SharedPreferenceConstants.KEY_REFRESH_ON_START, false) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/ImageCropperActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/ImageCropperActivity.kt index c092e3d62..0fd3e170a 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/ImageCropperActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/ImageCropperActivity.kt @@ -41,18 +41,18 @@ class ImageCropperActivity : BaseActivity(), CropImageView.OnSetImageUriComplete /** * Persist URI image to crop URI if specific permissions are required */ - private val cropImageUri: Uri get() = intent.getParcelableExtra(CropImage.CROP_IMAGE_EXTRA_SOURCE) + private val cropImageUri: Uri? get() = intent.getParcelableExtra(CropImage.CROP_IMAGE_EXTRA_SOURCE) /** * the options that were set for the crop image */ - private val options: CropImageOptions get() = intent.getParcelableExtra(CropImage.CROP_IMAGE_EXTRA_OPTIONS) + private val options: CropImageOptions? get() = intent.getParcelableExtra(CropImage.CROP_IMAGE_EXTRA_OPTIONS) /** * Get Android uri to save the cropped image into.

    * Use the given in options or create a temp file. */ - private val outputUri: Uri get() = options.outputUri + private val outputUri: Uri? get() = options?.outputUri @SuppressLint("NewApi") public override fun onCreate(savedInstanceState: Bundle?) { @@ -107,11 +107,13 @@ class ImageCropperActivity : BaseActivity(), CropImageView.OnSetImageUriComplete override fun onSetImageUriComplete(view: CropImageView, uri: Uri, error: Exception?) { if (error == null) { - if (options.initialCropWindowRectangle != null) { - cropImageView.cropRect = options.initialCropWindowRectangle - } - if (options.initialRotation > -1) { - cropImageView.rotatedDegrees = options.initialRotation + options?.let { options -> + if (options.initialCropWindowRectangle != null) { + cropImageView.cropRect = options.initialCropWindowRectangle + } + if (options.initialRotation > -1) { + cropImageView.rotatedDegrees = options.initialRotation + } } } else { setResult(null, error, 1) @@ -128,16 +130,18 @@ class ImageCropperActivity : BaseActivity(), CropImageView.OnSetImageUriComplete * Execute crop image and save the result to output uri. */ private fun cropImage() { - if (options.noOutputImage) { - setResult(null, null, 1) - } else { - val outputUri = outputUri - cropImageView.saveCroppedImageAsync(outputUri, - options.outputCompressFormat, - options.outputCompressQuality, - options.outputRequestWidth, - options.outputRequestHeight, - options.outputRequestSizeOptions) + options?.let { options -> + if (options.noOutputImage) { + setResult(null, null, 1) + } else { + val outputUri = outputUri + cropImageView.saveCroppedImageAsync(outputUri, + options.outputCompressFormat, + options.outputCompressQuality, + options.outputRequestWidth, + options.outputRequestHeight, + options.outputRequestSizeOptions) + } } } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/KeyboardShortcutPreferenceCompatActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/KeyboardShortcutPreferenceCompatActivity.kt index 40c2d645e..76835f5d2 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/KeyboardShortcutPreferenceCompatActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/KeyboardShortcutPreferenceCompatActivity.kt @@ -111,7 +111,7 @@ class KeyboardShortcutPreferenceCompatActivity : BaseActivity(), OnClickListener return true } - private val contextTag: String + private val contextTag: String? get() = intent.getStringExtra(EXTRA_CONTEXT_TAG) private val keyAction: String? diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/SignInActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/SignInActivity.kt index 45df854f6..339c8b716 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/SignInActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/SignInActivity.kt @@ -174,7 +174,9 @@ class SignInActivity : BaseActivity(), OnClickListener, TextWatcher, when (requestCode) { REQUEST_EDIT_API -> { if (resultCode == Activity.RESULT_OK && data != null) { - apiConfig = data.getParcelableExtra(EXTRA_API_CONFIG) + data.getParcelableExtra(EXTRA_API_CONFIG)?.let { + apiConfig = it + } updateSignInType() } setSignInButton() @@ -193,7 +195,9 @@ class SignInActivity : BaseActivity(), OnClickListener, TextWatcher, val clientId = extras.getString(EXTRA_CLIENT_ID)!! val clientSecret = extras.getString(EXTRA_CLIENT_SECRET)!! - finishMastodonBrowserLogin(host, clientId, clientSecret, code) + if (code != null) { + finishMastodonBrowserLogin(host, clientId, clientSecret, code) + } } } } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/UserListSelectorActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/UserListSelectorActivity.kt index d557a6de3..d3ecf9673 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/UserListSelectorActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/UserListSelectorActivity.kt @@ -137,7 +137,7 @@ class UserListSelectorActivity : BaseActivity(), when (requestCode) { REQUEST_SELECT_USER -> { if (resultCode == Activity.RESULT_OK && data != null) { - val user = data.getParcelableExtra(EXTRA_USER) + val user = data.getParcelableExtra(EXTRA_USER) ?: return loadUserLists(accountKey!!, user.key) } } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/content/AbsStatusDialogActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/content/AbsStatusDialogActivity.kt index 1353c4a9a..41cdb97f9 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/content/AbsStatusDialogActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/content/AbsStatusDialogActivity.kt @@ -74,7 +74,9 @@ abstract class AbsStatusDialogActivity : BaseActivity() { return } val accountKey = data.getParcelableExtra(EXTRA_ACCOUNT_KEY) - showDialogFragment(accountKey, statusId, status) + if (accountKey != null) { + showDialogFragment(accountKey, statusId, status) + } return } } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/premium/AbsExtraFeaturePurchaseActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/premium/AbsExtraFeaturePurchaseActivity.kt index 8736d063c..103c91a0f 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/premium/AbsExtraFeaturePurchaseActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/premium/AbsExtraFeaturePurchaseActivity.kt @@ -11,7 +11,7 @@ import org.mariotaku.twidere.model.premium.PurchaseResult */ abstract class AbsExtraFeaturePurchaseActivity : BaseActivity() { - protected val requestingFeature: String get() = intent.getStringExtra(EXTRA_REQUESTING_FEATURE) + protected val requestingFeature: String? get() = intent.getStringExtra(EXTRA_REQUESTING_FEATURE) protected fun finishWithError(code: Int) { setResult(code) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/shortcut/AbsUserListRelatedShortcutCreatorActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/shortcut/AbsUserListRelatedShortcutCreatorActivity.kt index 6c281ea4b..b9fcd336c 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/shortcut/AbsUserListRelatedShortcutCreatorActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/shortcut/AbsUserListRelatedShortcutCreatorActivity.kt @@ -44,8 +44,10 @@ abstract class AbsUserListRelatedShortcutCreatorActivity : AbsShortcutCreatorAct } val list = data.getParcelableExtra(EXTRA_USER_LIST) val extras = data.getBundleExtra(EXTRA_EXTRAS) - val accountKey = extras.getParcelable(EXTRA_ACCOUNT_KEY) - onUserListSelected(accountKey, list) + val accountKey = extras?.getParcelable(EXTRA_ACCOUNT_KEY) + if (list != null) { + onUserListSelected(accountKey, list) + } } else -> { super.onActivityResult(requestCode, resultCode, data) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/shortcut/AbsUserRelatedShortcutCreatorActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/shortcut/AbsUserRelatedShortcutCreatorActivity.kt index 0ddf72034..b6beec23f 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/shortcut/AbsUserRelatedShortcutCreatorActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/shortcut/AbsUserRelatedShortcutCreatorActivity.kt @@ -44,8 +44,10 @@ abstract class AbsUserRelatedShortcutCreatorActivity : AbsShortcutCreatorActivit } val user = data.getParcelableExtra(EXTRA_USER) val extras = data.getBundleExtra(EXTRA_EXTRAS) - val accountKey = extras.getParcelable(EXTRA_ACCOUNT_KEY) - onUserSelected(accountKey, user) + val accountKey = extras?.getParcelable(EXTRA_ACCOUNT_KEY) + if (user != null) { + onUserSelected(accountKey, user) + } } else -> { super.onActivityResult(requestCode, resultCode, data) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/app/TwidereApplication.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/app/TwidereApplication.kt index dae74fce7..bd67395d9 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/app/TwidereApplication.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/app/TwidereApplication.kt @@ -176,7 +176,7 @@ class TwidereApplication : Application(), OnSharedPreferenceChangeListener { }, updateImmediately = true) } - override fun onConfigurationChanged(newConfig: Configuration?) { + override fun onConfigurationChanged(newConfig: Configuration) { applyLanguageSettings() super.onConfigurationChanged(newConfig) } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/ConnectivityManagerExtensions.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/ConnectivityManagerExtensions.kt index 243518b4e..f0f6df01b 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/ConnectivityManagerExtensions.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/ConnectivityManagerExtensions.kt @@ -32,7 +32,7 @@ val ConnectivityManager.activateNetworkCompat: Network? return activeNetwork } val activeInfo = activeNetworkInfo ?: return null - return allNetworks.firstOrNull { activeInfo.same(getNetworkInfo(it)) } + return allNetworks.firstOrNull { getNetworkInfo(it)?.let { it1 -> activeInfo.same(it1) } == true } } private fun NetworkInfo.same(another: NetworkInfo) = type == another.type && subtype == another.subtype \ No newline at end of file diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AccountsManagerFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AccountsManagerFragment.kt index e63c0ca4c..095f207e4 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AccountsManagerFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AccountsManagerFragment.kt @@ -95,7 +95,7 @@ class AccountsManagerFragment : BaseFragment(), LoaderManager.LoaderCallbacks
  • (EXTRA_USER) + val user = data.getParcelableExtra(EXTRA_USER) ?: return twitter.addUserListMembersAsync(userList.account_key, userList.id, user) return } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/FilteredUsersFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/FilteredUsersFragment.kt index 68e544a0e..c8fc179c2 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/FilteredUsersFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/FilteredUsersFragment.kt @@ -64,7 +64,7 @@ class FilteredUsersFragment : BaseFiltersFragment() { when (requestCode) { REQUEST_SELECT_USER -> { if (resultCode != FragmentActivity.RESULT_OK || data == null) return - val user = data.getParcelableExtra(EXTRA_USER) + val user = data.getParcelableExtra(EXTRA_USER) ?: return executeAfterFragmentResumed { fragment -> AddUserFilterDialogFragment.show(fragment.childFragmentManager, user) } @@ -92,7 +92,7 @@ class FilteredUsersFragment : BaseFiltersFragment() { } REQUEST_EXPORT_MUTES_SELECT_ACCOUNT -> { if (resultCode != FragmentActivity.RESULT_OK || data == null) return - val accountKey = data.getParcelableExtra(EXTRA_ACCOUNT_KEY) + val accountKey = data.getParcelableExtra(EXTRA_ACCOUNT_KEY) ?: return val userKeys = data.getBundleExtra(EXTRA_EXTRAS)?.getNullableTypedArray(EXTRA_ITEMS) ?: return exportToMutedUsers(accountKey, userKeys) } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/media/ExternalBrowserPageFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/media/ExternalBrowserPageFragment.kt index 365d8de26..5ce6dc2eb 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/media/ExternalBrowserPageFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/media/ExternalBrowserPageFragment.kt @@ -45,7 +45,10 @@ class ExternalBrowserPageFragment : MediaViewerFragment() { webSettings.javaScriptEnabled = true webSettings.loadsImagesAutomatically = true val media = arguments?.getParcelable(EXTRA_MEDIA) ?: throw NullPointerException() - webView.loadUrl(if (TextUtils.isEmpty(media.media_url)) media.url else media.media_url) + val target = if (TextUtils.isEmpty(media.media_url)) media.url else media.media_url + target?.let { + webView.loadUrl(it) + } webViewContainer.setAspectRatioSource(VideoPageFragment.MediaAspectRatioSource(media, this)) } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/message/MessageConversationInfoFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/message/MessageConversationInfoFragment.kt index a9b77eefd..4834740e0 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/message/MessageConversationInfoFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/message/MessageConversationInfoFragment.kt @@ -188,8 +188,9 @@ class MessageConversationInfoFragment : BaseFragment(), IToolBarSupportFragment, when (requestCode) { REQUEST_CONVERSATION_ADD_USER -> { if (resultCode == Activity.RESULT_OK && data != null) { - val user = data.getParcelableExtra(EXTRA_USER) - performAddParticipant(user) + data.getParcelableExtra(EXTRA_USER)?.let { user -> + performAddParticipant(user) + } } } REQUEST_PICK_MEDIA -> { @@ -299,7 +300,7 @@ class MessageConversationInfoFragment : BaseFragment(), IToolBarSupportFragment, ProgressDialogFragment.show(childFragmentManager, "leave_conversation_progress") val weakThis = WeakReference(this) val task = DestroyConversationTask(requireContext(), accountKey, conversationId) - task.callback = callback@ { succeed -> + task.callback = callback@{ succeed -> val f = weakThis.get() ?: return@callback f.dismissDialogThen("leave_conversation_progress") { if (succeed) { @@ -315,7 +316,7 @@ class MessageConversationInfoFragment : BaseFragment(), IToolBarSupportFragment, ProgressDialogFragment.show(childFragmentManager, "clear_messages_progress") val weakThis = WeakReference(this) val task = ClearMessagesTask(requireContext(), accountKey, conversationId) - task.callback = callback@ { succeed -> + task.callback = callback@{ succeed -> val f = weakThis.get() ?: return@callback f.dismissDialogThen("clear_messages_progress") { if (succeed) { @@ -343,7 +344,7 @@ class MessageConversationInfoFragment : BaseFragment(), IToolBarSupportFragment, ProgressDialogFragment.show(childFragmentManager, "set_notifications_disabled_progress") val weakThis = WeakReference(this) val task = SetConversationNotificationDisabledTask(requireContext(), accountKey, conversationId, disabled) - task.callback = callback@ { _ -> + task.callback = callback@{ _ -> val f = weakThis.get() ?: return@callback f.dismissDialogThen("set_notifications_disabled_progress") { LoaderManager.getInstance(this).restartLoader(0, null, this) @@ -378,7 +379,7 @@ class MessageConversationInfoFragment : BaseFragment(), IToolBarSupportFragment, private fun performSetConversationName(name: String) { val conversationId = this.conversationId - performUpdateInfo("set_name_progress", updateAction = updateAction@ { fragment, account, microBlog -> + performUpdateInfo("set_name_progress", updateAction = updateAction@{ fragment, account, microBlog -> val context = fragment.context when (account.type) { AccountType.TWITTER -> { @@ -395,7 +396,7 @@ class MessageConversationInfoFragment : BaseFragment(), IToolBarSupportFragment, private fun performSetConversationAvatar(uri: Uri?) { val conversationId = this.conversationId - performUpdateInfo("set_avatar_progress", updateAction = updateAction@ { fragment, account, microBlog -> + performUpdateInfo("set_avatar_progress", updateAction = updateAction@{ fragment, account, microBlog -> val context = fragment.context when (account.type) { AccountType.TWITTER -> { diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/message/MessagesEntriesFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/message/MessagesEntriesFragment.kt index 00b667480..6cd25f4b8 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/message/MessagesEntriesFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/message/MessagesEntriesFragment.kt @@ -105,7 +105,7 @@ class MessagesEntriesFragment : AbsContentListRecyclerViewFragment { if (resultCode != Activity.RESULT_OK) return - val accountKey = data!!.getParcelableExtra(EXTRA_ACCOUNT_KEY) + val accountKey = data?.getParcelableExtra(EXTRA_ACCOUNT_KEY) ?: return startActivity(IntentUtils.newMessageConversation(accountKey)) } else -> { diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/menu/AccountActionProvider.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/menu/AccountActionProvider.kt index e76314cff..e485663fb 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/menu/AccountActionProvider.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/menu/AccountActionProvider.kt @@ -38,9 +38,10 @@ class AccountActionProvider( for (i in 0 until subMenu.size()) { val item = subMenu.getItem(i) val intent = item.intent - val account: AccountDetails = intent.getParcelableExtra(EXTRA_ACCOUNT) - if (it.contains(account.key)) { - item.isChecked = true + intent.getParcelableExtra(EXTRA_ACCOUNT)?.let { account -> + if (it.contains(account.key)) { + item.isChecked = true + } } } } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/model/analyzer/PurchaseFinished.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/model/analyzer/PurchaseFinished.kt index 3275735fd..2488a0cd0 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/model/analyzer/PurchaseFinished.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/model/analyzer/PurchaseFinished.kt @@ -19,7 +19,7 @@ data class PurchaseFinished(val productName: String) : Analyzer.Event { const val NAME_EXTRA_FEATURES = "Enhanced Features" fun create(data: Intent): PurchaseFinished { - val purchaseResult: PurchaseResult = data.getParcelableExtra(EXTRA_PURCHASE_RESULT) + val purchaseResult: PurchaseResult = data.getParcelableExtra(EXTRA_PURCHASE_RESULT)!! val result = PurchaseFinished(purchaseResult.feature) result.price = purchaseResult.price result.currency = purchaseResult.currency diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/model/tab/conf/TrendsLocationExtraConfiguration.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/model/tab/conf/TrendsLocationExtraConfiguration.kt index a2ca60f8b..74f425dd9 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/model/tab/conf/TrendsLocationExtraConfiguration.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/model/tab/conf/TrendsLocationExtraConfiguration.kt @@ -65,8 +65,9 @@ open class TrendsLocationExtraConfiguration( when (requestCode) { 1 -> { if (resultCode == Activity.RESULT_OK && data != null) { - val location = data.getParcelableExtra(EXTRA_LOCATION) - value = Place(location.woeid, location.name) + data.getParcelableExtra(EXTRA_LOCATION)?.let { location -> + value = Place(location.woeid, location.name) + } } } } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/model/tab/conf/UserExtraConfiguration.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/model/tab/conf/UserExtraConfiguration.kt index f643e47c0..9833a0096 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/model/tab/conf/UserExtraConfiguration.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/model/tab/conf/UserExtraConfiguration.kt @@ -62,11 +62,12 @@ class UserExtraConfiguration(key: String) : TabConfiguration.ExtraConfiguration( when (requestCode) { 1 -> { if (resultCode == Activity.RESULT_OK && data != null) { - val user: ParcelableUser = data.getParcelableExtra(EXTRA_USER) - viewHolder.displayUser(user) - viewHolder.itemView.visibility = View.VISIBLE - hintView.visibility = View.GONE - this.value = user + data.getParcelableExtra(EXTRA_USER)?.let { user -> + viewHolder.displayUser(user) + viewHolder.itemView.visibility = View.VISIBLE + hintView.visibility = View.GONE + this.value = user + } } } } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/model/tab/conf/UserListExtraConfiguration.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/model/tab/conf/UserListExtraConfiguration.kt index f614a6261..e6e8fa880 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/model/tab/conf/UserListExtraConfiguration.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/model/tab/conf/UserListExtraConfiguration.kt @@ -63,12 +63,13 @@ class UserListExtraConfiguration(key: String) : TabConfiguration.ExtraConfigurat when (requestCode) { 1 -> { if (resultCode == Activity.RESULT_OK) { - val userList: ParcelableUserList = data!!.getParcelableExtra(EXTRA_USER_LIST) - viewHolder.display(userList) - viewHolder.itemView.visibility = View.VISIBLE - hintView.visibility = View.GONE + data?.getParcelableExtra(EXTRA_USER_LIST)?.let { userList -> + viewHolder.display(userList) + viewHolder.itemView.visibility = View.VISIBLE + hintView.visibility = View.GONE - this.value = userList + this.value = userList + } } } } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/MultiSelectEventHandler.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/MultiSelectEventHandler.kt index bb3568b53..d3cd6c459 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/MultiSelectEventHandler.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/MultiSelectEventHandler.kt @@ -158,7 +158,7 @@ class MultiSelectEventHandler( if (item.groupId == AccountActionProvider.MENU_GROUP) { val intent = item.intent if (intent == null || !intent.hasExtra(EXTRA_ACCOUNT)) return false - val account: AccountDetails = intent.getParcelableExtra(EXTRA_ACCOUNT) + val account: AccountDetails = intent.getParcelableExtra(EXTRA_ACCOUNT) ?: return false multiSelectManager.accountKey = account.key accountActionProvider?.selectedAccountKeys = arrayOf(account.key) mode.invalidate() diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/view/LollipopFixedWebView.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/view/LollipopFixedWebView.kt index a4eb62c19..ca5a9cc14 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/view/LollipopFixedWebView.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/view/LollipopFixedWebView.kt @@ -14,12 +14,13 @@ private fun Context.fixForLollipop(): Context { class LollipopFixWebView: WebView { - constructor(context: Context?) : super(context?.fixForLollipop()) - constructor(context: Context?, attrs: AttributeSet?) : super(context?.fixForLollipop(), attrs) - constructor(context: Context?, attrs: AttributeSet?, defStyleAttr: Int) : super(context?.fixForLollipop(), attrs, defStyleAttr) - @TargetApi(Build.VERSION_CODES.LOLLIPOP) - constructor(context: Context?, attrs: AttributeSet?, defStyleAttr: Int, defStyleRes: Int) : super(context?.fixForLollipop(), attrs, defStyleAttr, defStyleRes) - constructor(context: Context?, attrs: AttributeSet?, defStyleAttr: Int, privateBrowsing: Boolean) : super(context?.fixForLollipop(), attrs, defStyleAttr, privateBrowsing) + constructor(context: Context) : super(context.fixForLollipop()) + constructor(context: Context, attrs: AttributeSet?) : super(context.fixForLollipop(), attrs) + constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super( + context.fixForLollipop(), + attrs, + defStyleAttr + ) init { isFocusable = true diff --git a/twidere/src/main/res/layout/layout_media_viewer_exo_player_view.xml b/twidere/src/main/res/layout/layout_media_viewer_exo_player_view.xml index c2b1abf89..1c4b61d66 100644 --- a/twidere/src/main/res/layout/layout_media_viewer_exo_player_view.xml +++ b/twidere/src/main/res/layout/layout_media_viewer_exo_player_view.xml @@ -25,7 +25,7 @@ android:layout_height="match_parent" android:layout_centerInParent="true"> - Date: Mon, 1 Mar 2021 16:31:28 +0800 Subject: [PATCH 25/29] update google commit id --- twidere/src/.google.commit-id | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/twidere/src/.google.commit-id b/twidere/src/.google.commit-id index 1f325bb25..33a92c544 100644 --- a/twidere/src/.google.commit-id +++ b/twidere/src/.google.commit-id @@ -1 +1 @@ -96c25a55cbb957eb9994154ca2f23cd036f4ddaf +7426fa281d7400010fbe834b45f011fa5668aa21 \ No newline at end of file From b1557f17be89bd667b71db452c48bc23281e60af Mon Sep 17 00:00:00 2001 From: Tlaster Date: Mon, 1 Mar 2021 16:32:09 +0800 Subject: [PATCH 26/29] make advance filter list enabled for fdroid --- .../extension/util/ExtraFeaturesServiceExtensions.kt | 2 +- .../twidere/fragment/filter/FilteredUsersFragment.kt | 4 ++-- .../fragment/filter/FiltersSubscriptionsFragment.kt | 4 ++-- twidere/src/main/res/xml/preferences_filters.xml | 9 +++++---- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/util/ExtraFeaturesServiceExtensions.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/util/ExtraFeaturesServiceExtensions.kt index 55b3035ca..33f4af1d9 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/util/ExtraFeaturesServiceExtensions.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/util/ExtraFeaturesServiceExtensions.kt @@ -26,4 +26,4 @@ import org.mariotaku.twidere.util.premium.ExtraFeaturesService.Companion.FEATURE * Created by mariotaku on 2017/9/14. */ val ExtraFeaturesService.isAdvancedFiltersEnabled: Boolean - get() = isEnabled(FEATURE_ADVANCED_FILTERS) || isEnabled("filters_subscriptions") \ No newline at end of file + get() = true//isEnabled(FEATURE_ADVANCED_FILTERS) || isEnabled("filters_subscriptions") \ No newline at end of file diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/FilteredUsersFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/FilteredUsersFragment.kt index c8fc179c2..b336649d2 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/FilteredUsersFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/FilteredUsersFragment.kt @@ -115,7 +115,7 @@ class FilteredUsersFragment : BaseFiltersFragment() { override fun onPrepareOptionsMenu(menu: Menu) { super.onPrepareOptionsMenu(menu) val isFeaturesSupported = extraFeaturesService.isSupported() - menu.setGroupAvailability(R.id.import_export, isFeaturesSupported) + menu.setGroupAvailability(R.id.import_export, true) } override fun onOptionsItemSelected(item: MenuItem): Boolean { @@ -147,7 +147,7 @@ class FilteredUsersFragment : BaseFiltersFragment() { override fun onPrepareActionMode(mode: ActionMode, menu: Menu): Boolean { val result = super.onPrepareActionMode(mode, menu) val isFeaturesSupported = extraFeaturesService.isSupported() - menu.setGroupAvailability(R.id.import_export, isFeaturesSupported) + menu.setGroupAvailability(R.id.import_export, true) return result && menu.hasVisibleItems() } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/FiltersSubscriptionsFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/FiltersSubscriptionsFragment.kt index b267a3f94..3e08ed63a 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/FiltersSubscriptionsFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/FiltersSubscriptionsFragment.kt @@ -71,8 +71,8 @@ class FiltersSubscriptionsFragment : BaseFragment(), LoaderManager.LoaderCallbac if (!extraFeaturesService.isSupported()) { - activity?.finish() - return +// activity?.finish() +// return } if (savedInstanceState == null) { diff --git a/twidere/src/main/res/xml/preferences_filters.xml b/twidere/src/main/res/xml/preferences_filters.xml index 14dbf25b5..cc159eff0 100644 --- a/twidere/src/main/res/xml/preferences_filters.xml +++ b/twidere/src/main/res/xml/preferences_filters.xml @@ -10,14 +10,15 @@ android:defaultValue="false" android:key="filter_possibility_sensitive_statuses" android:title="@string/preference_filter_possibility_sensitive_statuses"/> - - + - - + + \ No newline at end of file From 9d9a98d47bf3a8285899b3eb7bfa43bda3cd41b2 Mon Sep 17 00:00:00 2001 From: Tlaster Date: Mon, 1 Mar 2021 16:55:25 +0800 Subject: [PATCH 27/29] fix crash at status details adapter --- .../twidere/adapter/StatusDetailsAdapter.kt | 35 +++++++++++-------- 1 file changed, 20 insertions(+), 15 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 9973b4fd5..4250604f5 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/StatusDetailsAdapter.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/StatusDetailsAdapter.kt @@ -124,21 +124,26 @@ class StatusDetailsAdapter( } override fun getStatus(position: Int, raw: Boolean): ParcelableStatus { - when (getItemCountIndex(position, raw)) { - ITEM_IDX_CONVERSATION -> { - var idx = position - getIndexStart(ITEM_IDX_CONVERSATION) - if (data!![idx].is_filtered) idx++ - return data!![idx] - } - ITEM_IDX_REPLY -> { - 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] - } - ITEM_IDX_STATUS -> { - return status!! + data?.let { data -> + when (getItemCountIndex(position, raw)) { + ITEM_IDX_CONVERSATION -> { + var idx = position - getIndexStart(ITEM_IDX_CONVERSATION) + if (data.getOrNull(idx)?.is_filtered == true) idx++ + return data[idx] + } + ITEM_IDX_REPLY -> { + var idx = position - getIndexStart(ITEM_IDX_CONVERSATION) - + getTypeCount(ITEM_IDX_CONVERSATION) - getTypeCount(ITEM_IDX_STATUS) + + replyStart + if (data.getOrNull(idx)?.is_filtered == true) idx++ + return data[idx] + } + ITEM_IDX_STATUS -> { + return status!! + } + else -> { + + } } } throw IndexOutOfBoundsException("index: $position") From afac44ca43eb9401e55e33a6e1205cd063b9376d Mon Sep 17 00:00:00 2001 From: Tlaster Date: Mon, 1 Mar 2021 17:13:16 +0800 Subject: [PATCH 28/29] fix crash at status details adapter --- .../twidere/adapter/StatusDetailsAdapter.kt | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 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 4250604f5..e8671932c 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/StatusDetailsAdapter.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/StatusDetailsAdapter.kt @@ -124,26 +124,25 @@ class StatusDetailsAdapter( } override fun getStatus(position: Int, raw: Boolean): ParcelableStatus { - data?.let { data -> - when (getItemCountIndex(position, raw)) { - ITEM_IDX_CONVERSATION -> { + when (getItemCountIndex(position, raw)) { + ITEM_IDX_CONVERSATION -> { + data?.let { data -> var idx = position - getIndexStart(ITEM_IDX_CONVERSATION) - if (data.getOrNull(idx)?.is_filtered == true) idx++ + if (data[idx].is_filtered) idx++ return data[idx] } - ITEM_IDX_REPLY -> { + } + ITEM_IDX_REPLY -> { + data?.let { data -> var idx = position - getIndexStart(ITEM_IDX_CONVERSATION) - getTypeCount(ITEM_IDX_CONVERSATION) - getTypeCount(ITEM_IDX_STATUS) + replyStart - if (data.getOrNull(idx)?.is_filtered == true) idx++ + if (data[idx].is_filtered) idx++ return data[idx] } - ITEM_IDX_STATUS -> { - return status!! - } - else -> { - - } + } + ITEM_IDX_STATUS -> { + return status!! } } throw IndexOutOfBoundsException("index: $position") From 17397628fc6a9ae72efead50a038665f8e895426 Mon Sep 17 00:00:00 2001 From: Tlaster Date: Mon, 1 Mar 2021 17:23:35 +0800 Subject: [PATCH 29/29] add SQLiteBlobTooBigException catch for safeMoveToPosition --- .../main/kotlin/org/mariotaku/ktextension/CursorExtensions.kt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/twidere/src/main/kotlin/org/mariotaku/ktextension/CursorExtensions.kt b/twidere/src/main/kotlin/org/mariotaku/ktextension/CursorExtensions.kt index 34c70b59b..0989f1a3c 100644 --- a/twidere/src/main/kotlin/org/mariotaku/ktextension/CursorExtensions.kt +++ b/twidere/src/main/kotlin/org/mariotaku/ktextension/CursorExtensions.kt @@ -1,6 +1,7 @@ package org.mariotaku.ktextension import android.database.Cursor +import android.database.sqlite.SQLiteBlobTooBigException import org.mariotaku.library.objectcursor.ObjectCursor import java.util.* @@ -12,6 +13,8 @@ fun Cursor.safeMoveToPosition(pos: Int) = try { moveToPosition(pos) } catch (e: IllegalStateException) { false +} catch (e: SQLiteBlobTooBigException) { + false } fun Cursor.safeGetLong(columnIndex: Int, def: Long = -1) = try {