Merge branch 'maintenance'

TwidereProject · Mar 1, 2021 · 3b27b0b · 3b27b0b
2 parents 82c1f6b + 1739762
commit 3b27b0b
Show file tree

Hide file tree

Showing 161 changed files with 639 additions and 2,284 deletions.
diff --git 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
     }
@@ -17,19 +17,20 @@ buildscript {
 allprojects {
     ext {
         projectGroupId = 'org.mariotaku.twidere'
-        projectVersionCode = 513
-        projectVersionName = '4.1.4'
+        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,18 +39,18 @@ allprojects {
 subprojects {
     buildscript {
         ext {
-            kotlinVersion = '1.3.72'
+            kotlinVersion = '1.4.31'
             sharedVersions = [
                     Kotlin               : "${kotlinVersion}",
 
                     LoganSquare          : '1.3.7',
-                    Jackson              : '2.7.4',
+                    Jackson              : '2.12.1',
                     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/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/lint.xml b/lint.xml
diff --git 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.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/...ponent.common/src/main/java/org/mariotaku/twidere/constant/SharedPreferenceConstants.java b/...ponent.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.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.2'
 }
diff --git 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 {
@@ -175,11 +175,10 @@ ext {
     libVersions = [
             Kovenant          : '3.3.0',
             Mime4J            : '0.7.2',
-            Dagger            : '2.28',
-            Exoplayer         : '2.11.5',
+            Dagger            : '2.32',
+            Exoplayer         : '2.13.2',
             Glide             : '4.11.0',
             MediaViewerLibrary: '0.9.23',
-            PlayServices      : '17.0.0',
             Stetho            : '1.5.1',
     ]
 }
@@ -189,7 +188,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']}"
@@ -198,34 +197,34 @@ 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.2.0'
-    implementation 'androidx.core:core-ktx:1.2.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 **/
     compileOnly 'javax.annotation:jsr250-api:1.0'
-    implementation 'com.twitter:twitter-text:1.14.7'
-    implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.6.0'
+    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:2.1.9'
+    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'
     implementation 'com.github.uucky:ColorPicker-Android:0.9.7@aar'
     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']}"
@@ -235,26 +234,27 @@ 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']}"
     implementation 'org.attoparser:attoparser:2.0.5.RELEASE'
     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"
     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 **/
-    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']}") {
@@ -272,26 +272,28 @@ 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'
 
 
 /** 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
-        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'
@@ -305,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'
     }
@@ -314,10 +316,10 @@ dependencies {
 
 
 /** Testing **/
-    testImplementation 'junit:junit:4.12'
+    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'
 }
@@ -326,4 +328,4 @@ if (enableGoogleVariant) {
 // START Non-FOSS component
     apply plugin: 'com.google.gms.google-services'
 // END Non-FOSS component
-}
+}
diff --git a/twidere/src/.google.commit-id b/twidere/src/.google.commit-id
@@ -1 +1 @@
-e7e073e91e9088ca273f8618bf97e4e10f44b42c
+7426fa281d7400010fbe834b45f011fa5668aa21
diff --git a/...ndroidTest/kotlin/org/mariotaku/twidere/extension/text/twitter/ExtractorExtensionsTest.kt b/...ndroidTest/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/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
@@ -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/AndroidManifest.xml b/twidere/src/main/AndroidManifest.xml
@@ -249,6 +249,13 @@
                 <data android:mimeType="image/*"/>
                 <data android:mimeType="text/plain"/>
             </intent-filter>
+            <intent-filter android:label="@string/title_compose">
+                <action android:name="android.intent.action.PROCESS_TEXT" />
+
+                <category android:name="android.intent.category.DEFAULT"/>
+
+                <data android:mimeType="text/plain"/>
+            </intent-filter>
 
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		e7e073e91e9088ca273f8618bf97e4e10f44b42c
		7426fa281d7400010fbe834b45f011fa5668aa21