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

fixed crash on Nougat below

This commit is contained in:
Mariotaku Lee 2017-03-15 21:18:56 +08:00
parent 956fd8d7ab
commit f04c49af74
No known key found for this signature in database
GPG Key ID: 15C10F89D7C33535
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build.gradle
View File

@ -34,7 +34,7 @@ subprojects {
ext { ext {
libVersions = [ libVersions = [
Kotlin : '1.1.1', Kotlin : '1.1.1',
SupportLib : '25.2.0', SupportLib : '25.3.0',
MariotakuCommons: '0.9.11', MariotakuCommons: '0.9.11',
RestFu : '0.9.42', RestFu : '0.9.42',
ObjectCursor : '0.9.16', ObjectCursor : '0.9.16',
@ -50,7 +50,11 @@ subprojects {
LoganSquare : '1.3.7', LoganSquare : '1.3.7',
IABv3 : '1.0.38', IABv3 : '1.0.38',
Mime4J : '0.7.2', Mime4J : '0.7.2',
Stetho : '1.4.2' Stetho : '1.4.2',
OSMDroid : '5.6.4',
LeakCanary : '1.5',
TwitterText : '1.14.3',
MediaViewerLibrary : '0.9.23'
] ]
} }

14
twidere/build.gradle
View File

@ -36,8 +36,8 @@ android {
applicationId "org.mariotaku.twidere" applicationId "org.mariotaku.twidere"
minSdkVersion 14 minSdkVersion 14
targetSdkVersion 25 targetSdkVersion 25
versionCode 300 versionCode 301
versionName '3.4.38' versionName '3.4.39'
multiDexEnabled true multiDexEnabled true
buildConfigField 'boolean', 'LEAK_CANARY_ENABLED', 'Boolean.parseBoolean("true")' buildConfigField 'boolean', 'LEAK_CANARY_ENABLED', 'Boolean.parseBoolean("true")'
@ -113,12 +113,12 @@ dependencies {
} }
// END Non-FOSS component // END Non-FOSS component
fdroidCompile 'org.osmdroid:osmdroid-android:5.6.4' fdroidCompile "org.osmdroid:osmdroid-android:${libVersions['OSMDroid']}"
debugCompile "com.facebook.stetho:stetho:${libVersions['Stetho']}" debugCompile "com.facebook.stetho:stetho:${libVersions['Stetho']}"
debugCompile "com.facebook.stetho:stetho-okhttp3:${libVersions['Stetho']}" debugCompile "com.facebook.stetho:stetho-okhttp3:${libVersions['Stetho']}"
debugCompile "com.facebook.stetho:stetho-js-rhino:${libVersions['Stetho']}" debugCompile "com.facebook.stetho:stetho-js-rhino:${libVersions['Stetho']}"
debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5' debugCompile "com.squareup.leakcanary:leakcanary-android:${libVersions['LeakCanary']}"
debugCompile('com.jayway.jsonpath:json-path:2.2.0') { debugCompile('com.jayway.jsonpath:json-path:2.2.0') {
exclude group: 'net.minidev', module: 'json-smart' exclude group: 'net.minidev', module: 'json-smart'
} }
@ -141,7 +141,7 @@ dependencies {
compile "com.android.support:customtabs:${libVersions['SupportLib']}" compile "com.android.support:customtabs:${libVersions['SupportLib']}"
compile "com.android.support:design:${libVersions['SupportLib']}" compile "com.android.support:design:${libVersions['SupportLib']}"
compile "com.android.support:percent:${libVersions['SupportLib']}" compile "com.android.support:percent:${libVersions['SupportLib']}"
compile 'com.twitter:twitter-text:1.14.3' compile "com.twitter:twitter-text:${libVersions['TwitterText']}"
compile 'com.davemorrissey.labs:subsampling-scale-image-view:3.6.0' compile 'com.davemorrissey.labs:subsampling-scale-image-view:3.6.0'
compile 'com.squareup:otto:1.3.8' compile 'com.squareup:otto:1.3.8'
compile 'dnsjava:dnsjava:2.1.8' compile 'dnsjava:dnsjava:2.1.8'
@ -176,8 +176,8 @@ dependencies {
compile 'com.github.bumptech.glide:okhttp3-integration:1.4.0@aar' compile 'com.github.bumptech.glide:okhttp3-integration:1.4.0@aar'
compile 'jp.wasabeef:glide-transformations:2.0.1' compile 'jp.wasabeef:glide-transformations:2.0.1'
compile 'com.github.mariotaku.MediaViewerLibrary:base:0.9.23' compile "com.github.mariotaku.MediaViewerLibrary:base:${libVersions['MediaViewerLibrary']}"
compile 'com.github.mariotaku.MediaViewerLibrary:subsample-image-view:0.9.23' compile "com.github.mariotaku.MediaViewerLibrary:subsample-image-view:${libVersions['MediaViewerLibrary']}"
compile 'com.github.mariotaku:SQLiteQB:0.9.12' compile 'com.github.mariotaku:SQLiteQB:0.9.12'
compile "com.github.mariotaku.ObjectCursor:core:${libVersions['ObjectCursor']}" compile "com.github.mariotaku.ObjectCursor:core:${libVersions['ObjectCursor']}"
compile 'com.github.mariotaku:MultiValueSwitch:0.9.7' compile 'com.github.mariotaku:MultiValueSwitch:0.9.7'

4
twidere/src/main/kotlin/org/mariotaku/twidere/service/StreamingService.kt
View File

@ -76,9 +76,7 @@ class StreamingService : BaseService() {
} }
override fun onDestroy() { override fun onDestroy() {
submittedTasks.forEach { _, future -> submittedTasks.values.forEach { it.cancel() }
future.cancel()
}
threadPoolExecutor.shutdown() threadPoolExecutor.shutdown()
submittedTasks.clear() submittedTasks.clear()
removeNotification() removeNotification()