From f4603007391380e938ae92466520bcf611bb405e Mon Sep 17 00:00:00 2001 From: "hanjoongcho\\hanjoong" Date: Sat, 22 Aug 2020 11:45:52 +0900 Subject: [PATCH] Refactoring --- .../fragments/SettingsGMSBackupFragment.kt | 17 ++++++++++------- app/src/main/assets/RELEASE_en | 3 +++ app/src/main/assets/RELEASE_ja | 3 +++ app/src/main/assets/RELEASE_ko | 3 +++ .../easydiary/activities/EasyDiaryActivity.kt | 1 + app/src/main/res/values-de/strings.xml | 4 ++++ app/src/main/res/values-en/strings.xml | 4 ++++ app/src/main/res/values-fr/strings.xml | 4 ++++ app/src/main/res/values-ja/strings.xml | 6 +++++- app/src/main/res/values-ko/strings.xml | 6 +++++- app/src/main/res/values-ru/strings.xml | 4 ++++ app/src/main/res/values-zh-rCN/strings.xml | 4 ++++ app/src/main/res/values/strings.xml | 4 ++++ 13 files changed, 54 insertions(+), 9 deletions(-) diff --git a/app/src/gms/java/me/blog/korn123/easydiary/fragments/SettingsGMSBackupFragment.kt b/app/src/gms/java/me/blog/korn123/easydiary/fragments/SettingsGMSBackupFragment.kt index efc42c406..b181858a5 100644 --- a/app/src/gms/java/me/blog/korn123/easydiary/fragments/SettingsGMSBackupFragment.kt +++ b/app/src/gms/java/me/blog/korn123/easydiary/fragments/SettingsGMSBackupFragment.kt @@ -1,6 +1,7 @@ package me.blog.korn123.easydiary.fragments import android.app.Activity +import android.content.Context import android.content.DialogInterface import android.content.Intent import android.os.Bundle @@ -41,15 +42,17 @@ class SettingsGMSBackupFragment() : androidx.fragment.app.Fragment() { ***************************************************************************************************/ private lateinit var progressContainer: ConstraintLayout private lateinit var mRootView: ViewGroup + private lateinit var mContext: Context private var mTaskFlag = 0 private val mActivity: Activity get() = activity!! - /*************************************************************************************************** - * override functions - * - ***************************************************************************************************/ + override fun onAttach(context: Context) { + super.onAttach(context) + this.mContext = context + } + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { mRootView = inflater.inflate(R.layout.layout_settings_backup_gms, container, false) as ViewGroup return mRootView @@ -133,7 +136,7 @@ class SettingsGMSBackupFragment() : androidx.fragment.app.Fragment() { progressContainer.visibility = View.VISIBLE val realmPath = EasyDiaryDbHelper.getRealmPath() initGoogleSignAccount(this) { account -> - DriveServiceHelper(mActivity, account).run { + DriveServiceHelper(mContext, account).run { initDriveWorkingDirectory(DriveServiceHelper.AAF_EASY_DIARY_REALM_FOLDER_NAME) { createFile( it!!, realmPath, @@ -162,7 +165,7 @@ class SettingsGMSBackupFragment() : androidx.fragment.app.Fragment() { private fun openRealmFilePickerDialog() { initGoogleSignAccount(this) { account -> - val driveServiceHelper = DriveServiceHelper(mActivity, account) + val driveServiceHelper = DriveServiceHelper(mContext, account) // driveServiceHelper.queryFiles("mimeType contains 'text/aaf_v' and name contains '$DIARY_DB_NAME'", 1000) @@ -231,7 +234,7 @@ class SettingsGMSBackupFragment() : androidx.fragment.app.Fragment() { mActivity.setScreenOrientationSensor(false) progressContainer.visibility = View.VISIBLE initGoogleSignAccount(this) { account -> - DriveServiceHelper(mActivity, account).run { + DriveServiceHelper(mContext, account).run { initDriveWorkingDirectory(DriveServiceHelper.AAF_EASY_DIARY_PHOTO_FOLDER_NAME) { photoFolderId -> progressContainer.visibility = View.GONE mActivity.run { diff --git a/app/src/main/assets/RELEASE_en b/app/src/main/assets/RELEASE_en index 99c5485ca..f23584eaa 100644 --- a/app/src/main/assets/RELEASE_en +++ b/app/src/main/assets/RELEASE_en @@ -4,6 +4,9 @@ --------------------------------------------------- +# Changes in 1.4.142 (date: 2020.08.22) + * Fixed an issue where some devices were abnormally terminated in the setting screen + # Changes in 1.4.141 (date: 2020.08.03) * User Experience (UX) Optimization * French translation updates diff --git a/app/src/main/assets/RELEASE_ja b/app/src/main/assets/RELEASE_ja index dfe23a693..0ec136f57 100644 --- a/app/src/main/assets/RELEASE_ja +++ b/app/src/main/assets/RELEASE_ja @@ -4,6 +4,9 @@ --------------------------------------------------- +# Changes in 1.4.142 (date: 2020.08.22) + * 一部のデバイスが設定画面で異常終了する問題を修正しました + # Changes in 1.4.141 (date: 2020.08.03) * ユーザーエクスペリエンス（UX）の最適化 * フランス語翻訳の更新 diff --git a/app/src/main/assets/RELEASE_ko b/app/src/main/assets/RELEASE_ko index c5de0e3b9..3a06bdb72 100644 --- a/app/src/main/assets/RELEASE_ko +++ b/app/src/main/assets/RELEASE_ko @@ -4,6 +4,9 @@ --------------------------------------------------- +# Changes in 1.4.142 (date: 2020.08.22) + * 일부기기가 설정화면에서 비정상 종료되는 이슈 해결 + # Changes in 1.4.141 (date: 2020.08.03) * 사용자경험(UX) 최적화 * 프랑스어 번역 업데이트 diff --git a/app/src/main/java/me/blog/korn123/easydiary/activities/EasyDiaryActivity.kt b/app/src/main/java/me/blog/korn123/easydiary/activities/EasyDiaryActivity.kt index e8de9e160..d4636bf45 100644 --- a/app/src/main/java/me/blog/korn123/easydiary/activities/EasyDiaryActivity.kt +++ b/app/src/main/java/me/blog/korn123/easydiary/activities/EasyDiaryActivity.kt @@ -58,6 +58,7 @@ open class EasyDiaryActivity : BaseSimpleActivity() { fun checkWhatsNewDialog(applyFilter: Boolean = true) { arrayListOf().apply { + add(Release(208, R.string.release_208)) add(Release(207, R.string.release_207)) add(Release(206, R.string.release_206)) add(Release(205, R.string.release_205)) diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 5cfd6ac8b..210071fe9 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -449,6 +449,10 @@ User Experience (UX) Optimization\n French translation updates + + v1.4.142 / 2020.08.22\n + Fixed an issue where some devices were abnormally terminated in the setting screen + diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml index 4eda5e2b7..380e63cd7 100644 --- a/app/src/main/res/values-en/strings.xml +++ b/app/src/main/res/values-en/strings.xml @@ -449,6 +449,10 @@ User Experience (UX) Optimization\n French translation updates + + v1.4.142 / 2020.08.22\n + Fixed an issue where some devices were abnormally terminated in the setting screen + diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index c33ef2b04..49800ff6a 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -449,6 +449,10 @@ User Experience (UX) Optimization\n French translation updates + + v1.4.142 / 2020.08.22\n + Fixed an issue where some devices were abnormally terminated in the setting screen + diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 1f0008c59..499e052af 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -442,13 +442,17 @@ v1.4.140 / 2020.07.20\n - Fixed an error that the scheduler did not work in the application termination state + アプリケーションが最近使用アプリ一覧から削除された場合、スケジューラが動作しなかったエラーを修正する v1.4.141 / 2020.08.03\n ユーザーエクスペリエンス（UX）の最適化\n フランス語翻訳の更新 + + v1.4.142 / 2020.08.22\n + 一部のデバイスが設定画面で異常終了する問題を修正しました + diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index e8fdc1bdf..405e1f88a 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -442,13 +442,17 @@ v1.4.140 / 2020.07.20\n - Fixed an error that the scheduler did not work in the application termination state + 애플리케이션이 최근 사용 앱 목록에서 제거되는 경우 스케줄러가 동작하지 않던 오류를 수정함 v1.4.141 / 2020.08.03\n 사용자경험(UX) 최적화\n 프랑스어 번역 업데이트 + + v1.4.142 / 2020.08.22\n + 일부기기가 설정화면에서 비정상 종료되는 이슈 해결 + diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 6f82a2ab2..ecfabe8d8 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -449,6 +449,10 @@ User Experience (UX) Optimization\n French translation updates + + v1.4.142 / 2020.08.22\n + Fixed an issue where some devices were abnormally terminated in the setting screen + diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index cabf059a7..abde0e43f 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -449,6 +449,10 @@ User Experience (UX) Optimization\n French translation updates + + v1.4.142 / 2020.08.22\n + Fixed an issue where some devices were abnormally terminated in the setting screen + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4eda5e2b7..380e63cd7 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -449,6 +449,10 @@ User Experience (UX) Optimization\n French translation updates + + v1.4.142 / 2020.08.22\n + Fixed an issue where some devices were abnormally terminated in the setting screen +