From 127d59214261bd913aabe153064d2df16ff7e364 Mon Sep 17 00:00:00 2001 From: tateisu Date: Mon, 22 Apr 2019 08:45:33 +0900 Subject: [PATCH] =?UTF-8?q?OSS=E3=83=A9=E3=82=A4=E3=82=BB=E3=83=B3?= =?UTF-8?q?=E3=82=B9=E3=81=ABAndroidSVG=E3=82=92=E8=BF=BD=E8=A8=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/jp/juggler/subwaytooter/ActPost.kt | 12 ++-- app/src/main/res/raw/oss_license.txt | 64 ++++++++++++++----- 2 files changed, 53 insertions(+), 23 deletions(-) diff --git a/app/src/main/java/jp/juggler/subwaytooter/ActPost.kt b/app/src/main/java/jp/juggler/subwaytooter/ActPost.kt index f4d83d14..50c38276 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/ActPost.kt +++ b/app/src/main/java/jp/juggler/subwaytooter/ActPost.kt @@ -116,7 +116,7 @@ class ActPost : AppCompatActivity(), private val imageHeaderList = arrayOf( Pair( "image/jpeg", - intArrayOf(0xff, 0xd8, 0xff ).toByteArray() + intArrayOf(0xff, 0xd8, 0xff).toByteArray() ), Pair( "image/png", @@ -144,7 +144,6 @@ class ActPost : AppCompatActivity(), } return null } - // private void performCameraVideo(){ // // try{ @@ -555,8 +554,7 @@ class ActPost : AppCompatActivity(), if(sent_intent != null) { appendContentText(sent_intent) - val action = sent_intent.action - when(action) { + when(sent_intent.action) { Intent.ACTION_VIEW -> { val uri = sent_intent.data val type = sent_intent.type @@ -873,7 +871,7 @@ class ActPost : AppCompatActivity(), outState.putInt(KEY_VISIBILITY, it.id) } - if(! attachment_list.isEmpty()) { + if(attachment_list.isNotEmpty()) { val array = JSONArray() for(pa in attachment_list) { // アップロード完了したものだけ保持する @@ -1257,7 +1255,7 @@ class ActPost : AppCompatActivity(), return } - if(! attachment_list.isEmpty()) { + if(attachment_list.isNotEmpty()) { // 添付ファイルがあったら確認の上添付ファイルを捨てないと切り替えられない showToast(this, false, R.string.cant_change_account_when_attachment_specified) return @@ -2626,7 +2624,7 @@ class ActPost : AppCompatActivity(), showEnquete() showQuotedRenote() - if(! list_warning.isEmpty()) { + if(list_warning.isNotEmpty()) { val sb = StringBuilder() for(s in list_warning) { if(sb.isNotEmpty()) sb.append("\n") diff --git a/app/src/main/res/raw/oss_license.txt b/app/src/main/res/raw/oss_license.txt index eb688d5d..84b2553d 100644 --- a/app/src/main/res/raw/oss_license.txt +++ b/app/src/main/res/raw/oss_license.txt @@ -2,6 +2,8 @@ tateisu/SubwayTooter https://github.com/tateisu/SubwayTooter +Copyright (C) 2017 tateisu + Licensed 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 @@ -14,24 +16,12 @@ 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. -==================================================== -Ranks/emojione -https://github.com/Ranks/emojione - -EmojiOne Artwork -- Applies to all PNG files found in the emojione-assets repo as well as any adaptations made. -- Free license: emojione.com/developers/free-license -- Premium license: emojione.com/developers/premium-license - -EmojiOne Non-Artwork -- Applies to the Javascript, JSON, PHP, CSS, HTML files, and everything else not covered under the artwork license above, found in both the emojione and emojione-assets repos. -- License: MIT -- Complete Legal Terms: http://opensource.org/licenses/MIT - ==================================================== square/okhttp https://github.com/square/okhttp +Copyright (C) 2012 Square, Inc. + Licensed 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 @@ -152,6 +142,8 @@ limitations under the License. jrummyapps/colorpicker https://github.com/jrummyapps/colorpicker +Copyright (C) 2017 Jared Rummler + Licensed 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 @@ -225,10 +217,10 @@ SOFTWARE. iamcal/emoji-data https://github.com/iamcal/emoji-data -The MIT License (MIT) - Copyright (c) 2013 Cal Henderson +The MIT License (MIT) + 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 @@ -275,6 +267,8 @@ THE SOFTWARE. google/ExoPlayer https://github.com/google/ExoPlayer +Copyright (C) 2018 The Android Open Source Project + Licensed 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 @@ -297,3 +291,41 @@ https://icons8.com/articles/weve-contributed-an-icon-to-imageoptim/ https://wee.jp/mastodon/ Copyright 2018 weepjp, kyori19. + +==================================================== +BigBadaboom/AndroidSVG +https://github.com/BigBadaboom/androidsvg + +Copyright 2014 Paul LeBeau, Cave Rock Software Ltd. + +Licensed 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. + +==================================================== +google/Conscrypt +https://github.com/google/conscrypt + +Copyright (C) 2017 The Android Open Source Project + +Licensed 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. + +====================================================