From c05eae48e3761123e22e74285772875f3d1839e6 Mon Sep 17 00:00:00 2001 From: tateisu Date: Mon, 10 Sep 2018 11:27:55 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=AA=E3=83=95=E3=82=A1=E3=82=AF=E3=82=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 1 + .../java/jp/juggler/fadownloader/ActMain.kt | 5 -- .../jp/juggler/fadownloader/DownloadWorker.kt | 30 ++++---- .../java/jp/juggler/fadownloader/PageLog.kt | 16 ++--- .../fadownloader/tracker/LocationTracker.kt | 1 - .../fadownloader/tracker/NetworkTracker.kt | 6 +- .../juggler/fadownloader/util/HTTPClient.kt | 4 +- .../fadownloader/util/PermissionChecker.kt | 2 +- .../fadownloader/util/ProgressDialogEx.kt | 2 +- app/src/main/res/layout/act_main.xml | 39 ++++++++--- .../main/res/layout/folder_create_dialog.xml | 2 + app/src/main/res/layout/new_file_widget.xml | 68 +++++++++---------- app/src/main/res/layout/page_setting.xml | 6 ++ app/src/main/res/menu/act_main.xml | 8 --- app/src/main/res/values-ja/strings.xml | 15 ++-- app/src/main/res/values-v14/dimens.xml | 4 -- app/src/main/res/values/dimens.xml | 3 - app/src/main/res/values/strings.xml | 17 +++-- app/src/main/res/values/styles.xml | 14 ++-- app/src/main/res/xml/backup_descriptor.xml | 5 ++ app/src/main/res/xml/file_provider_path.xml | 3 +- app/src/main/res/xml/new_file_widget.xml | 5 +- 22 files changed, 136 insertions(+), 120 deletions(-) delete mode 100644 app/src/main/res/menu/act_main.xml delete mode 100644 app/src/main/res/values-v14/dimens.xml create mode 100644 app/src/main/res/xml/backup_descriptor.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 642e602..6d0946f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -25,6 +25,7 @@ android:supportsRtl="true" android:theme="@style/AppTheme" tools:ignore="AllowBackup,GoogleAppIndexingWarning" + android:fullBackupContent="@xml/backup_descriptor" > 0L) { - val bc = queued_byte_count.get() - val bcm = queued_byte_count_max.get() - return s !! + String.format( - "\n%s %d%%, %s %dfile %sbyte", - service.getString(R.string.progress), - if(bcm <= 0) 0 else 100L * (bcm - bc) / bcm, - service.getString(R.string.remain), - fc, - Utils.formatBytes(bc) - ) - } else if(s != null && s.contains(MACRO_WAIT_UNTIL)) { - var remain = wait_until.get() - SystemClock.elapsedRealtime() - if(remain < 0L) remain = 0L - return s.replace(MACRO_WAIT_UNTIL, Utils.formatTimeDuration(remain)) - } else { - return s + return when { + fc > 0L -> { + val bc = queued_byte_count.get() + val bcm = queued_byte_count_max.get() + "$s\n${service.getString(R.string.progress)} ${if(bcm <= 0) 0 else 100L * (bcm - bc) / bcm}%, ${service.getString(R.string.remain)} ${fc}file ${Utils.formatBytes(bc)}byte" + + } + s?.contains(MACRO_WAIT_UNTIL) ==true -> { + var remain = wait_until.get() - SystemClock.elapsedRealtime() + if(remain < 0L) remain = 0L + s.replace(MACRO_WAIT_UNTIL, Utils.formatTimeDuration(remain)) + } + else -> s } } diff --git a/app/src/main/java/jp/juggler/fadownloader/PageLog.kt b/app/src/main/java/jp/juggler/fadownloader/PageLog.kt index aded867..de0d106 100644 --- a/app/src/main/java/jp/juggler/fadownloader/PageLog.kt +++ b/app/src/main/java/jp/juggler/fadownloader/PageLog.kt @@ -105,18 +105,16 @@ class PageLog(activity : Activity, ignored : View) : var i = 0 var count = cursor.count if(count <= 0) count = 1 - val colidx_time = cursor.getColumnIndex(LogData.COL_TIME) - val colidx_message = cursor.getColumnIndex(LogData.COL_MESSAGE) - val colidx_level = cursor.getColumnIndex(LogData.COL_LEVEL) + val colIdx_time = cursor.getColumnIndex(LogData.COL_TIME) + val colIdx_message = cursor.getColumnIndex(LogData.COL_MESSAGE) + val colIdx_level = cursor.getColumnIndex(LogData.COL_LEVEL) while(cursor.moveToNext()) { if(isCancelled) return null publishProgress(i ++, count) - fos.printf( - "%s %s/%s\n", - LogViewer.date_fmt.format(cursor.getLong(colidx_time)), - LogData.getLogLevelString(cursor.getInt(colidx_level)), - cursor.getString(colidx_message) - ) + val date = LogViewer.date_fmt.format(cursor.getLong(colIdx_time)) + val level = LogData.getLogLevelString(cursor.getInt(colIdx_level)) + val message = cursor.getString(colIdx_message) + fos.print("$date $level/$message\n") } } diff --git a/app/src/main/java/jp/juggler/fadownloader/tracker/LocationTracker.kt b/app/src/main/java/jp/juggler/fadownloader/tracker/LocationTracker.kt index f30367e..56f0ea2 100644 --- a/app/src/main/java/jp/juggler/fadownloader/tracker/LocationTracker.kt +++ b/app/src/main/java/jp/juggler/fadownloader/tracker/LocationTracker.kt @@ -2,7 +2,6 @@ package jp.juggler.fadownloader.tracker import android.content.Context import android.location.Location -import android.os.SystemClock import com.google.android.gms.location.* import jp.juggler.fadownloader.R import jp.juggler.fadownloader.util.LogWriter diff --git a/app/src/main/java/jp/juggler/fadownloader/tracker/NetworkTracker.kt b/app/src/main/java/jp/juggler/fadownloader/tracker/NetworkTracker.kt index c315e0e..3635a10 100644 --- a/app/src/main/java/jp/juggler/fadownloader/tracker/NetworkTracker.kt +++ b/app/src/main/java/jp/juggler/fadownloader/tracker/NetworkTracker.kt @@ -217,9 +217,9 @@ class NetworkTracker( conn.readTimeout = 30000 conn.doOutput = false conn.connect() - val rcode = conn.responseCode - if(rcode != 200) { - log.e("HTTP error %s. url=%s", rcode, check_url) + val resCode = conn.responseCode + if(resCode != 200) { + log.e("HTTP error %s. url=%s", resCode, check_url) } else { if(target_url != last_flash_air_url.get()) { log.i("target detected. %s", target_url) diff --git a/app/src/main/java/jp/juggler/fadownloader/util/HTTPClient.kt b/app/src/main/java/jp/juggler/fadownloader/util/HTTPClient.kt index 6cd6cae..aaae9c3 100644 --- a/app/src/main/java/jp/juggler/fadownloader/util/HTTPClient.kt +++ b/app/src/main/java/jp/juggler/fadownloader/util/HTTPClient.kt @@ -727,12 +727,12 @@ class HTTPClient { //! HTTPレスポンスのヘッダを読む @Suppress("unused") - fun getHeaderInt(key : String, defval : Int) : Int { + fun getHeaderInt(key : String, defVal : Int) : Int { val v = getHeaderString(key, null) return try { Integer.parseInt(v, 10) } catch(ex : Throwable) { - defval + defVal } } } diff --git a/app/src/main/java/jp/juggler/fadownloader/util/PermissionChecker.kt b/app/src/main/java/jp/juggler/fadownloader/util/PermissionChecker.kt index f0a0343..5511946 100644 --- a/app/src/main/java/jp/juggler/fadownloader/util/PermissionChecker.kt +++ b/app/src/main/java/jp/juggler/fadownloader/util/PermissionChecker.kt @@ -10,7 +10,7 @@ import java.util.ArrayList object PermissionChecker { - internal val permission_list = arrayOf( + private val permission_list = arrayOf( Manifest.permission.INTERNET, Manifest.permission.ACCESS_WIFI_STATE, Manifest.permission.ACCESS_NETWORK_STATE, diff --git a/app/src/main/java/jp/juggler/fadownloader/util/ProgressDialogEx.kt b/app/src/main/java/jp/juggler/fadownloader/util/ProgressDialogEx.kt index 2313361..49349f4 100644 --- a/app/src/main/java/jp/juggler/fadownloader/util/ProgressDialogEx.kt +++ b/app/src/main/java/jp/juggler/fadownloader/util/ProgressDialogEx.kt @@ -7,7 +7,7 @@ import android.content.Context class ProgressDialogEx(context: Context) : ProgressDialog(context){ companion object { - const val STYLE_SPINNER = ProgressDialog.STYLE_SPINNER + // const val STYLE_SPINNER = ProgressDialog.STYLE_SPINNER const val STYLE_HORIZONTAL = ProgressDialog.STYLE_HORIZONTAL } diff --git a/app/src/main/res/layout/act_main.xml b/app/src/main/res/layout/act_main.xml index 3899c11..58a33d8 100644 --- a/app/src/main/res/layout/act_main.xml +++ b/app/src/main/res/layout/act_main.xml @@ -8,6 +8,7 @@ android:layout_height="match_parent" android:orientation="vertical" tools:context="jp.juggler.fadownloader.ActMain" + tools:ignore="SpUsage" > - + > + + + + + +