Use Western digits where Western digits are required; show locale in debug info (1ed91ff1) · Commits · e / os / AccountManager

app/src/main/java/at/bitfire/davdroid/DavUtils.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -39,7 +39,7 @@ object DavUtils {
		fun ARGBtoCalDAVColor(colorWithAlpha: Int): String {
		val alpha = (colorWithAlpha shr 24) and 0xFF
		val color = colorWithAlpha and 0xFFFFFF
		return String.format("#%06X%02X", color, alpha)
		return String.format(Locale.ROOT, "#%06X%02X", color, alpha)
		}

+6 −2

Original line number	Diff line number	Diff line
		@@ -232,12 +232,16 @@ class HttpClient private constructor(


		private object UserAgentInterceptor: Interceptor {
		// use Locale.US because numbers may be encoded as non-ASCII characters in other locales
		private val userAgentDateFormat = SimpleDateFormat("yyyy/MM/dd", Locale.US)
		// use Locale.ROOT because numbers may be encoded as non-ASCII characters in other locales
		private val userAgentDateFormat = SimpleDateFormat("yyyy/MM/dd", Locale.ROOT)
		private val userAgentDate = userAgentDateFormat.format(Date(BuildConfig.buildTime))
		private val userAgent = "${BuildConfig.userAgent}/${BuildConfig.VERSION_NAME} ($userAgentDate; dav4jvm; " +
		"okhttp/${OkHttp.VERSION}) Android/${Build.VERSION.RELEASE}"

		init {
		Logger.log.info("Will set \"User-Agent: $userAgent\" for further requests")
		}

		override fun intercept(chain: Interceptor.Chain): Response {
		val locale = Locale.getDefault()
		val request = chain.request().newBuilder()

+2 −1

Original line number	Diff line number	Diff line
		@@ -11,6 +11,7 @@ package at.bitfire.davdroid.log
		import org.apache.commons.lang3.StringUtils
		import org.apache.commons.lang3.exception.ExceptionUtils
		import org.apache.commons.lang3.time.DateFormatUtils
		import java.util.*
		import java.util.logging.Formatter
		import java.util.logging.LogRecord

		@@ -29,7 +30,7 @@ class PlainTextFormatter private constructor(
		val builder = StringBuilder()

		if (!logcat)
		builder .append(DateFormatUtils.format(r.millis, "yyyy-MM-dd HH:mm:ss"))
		builder .append(DateFormatUtils.format(r.millis, "yyyy-MM-dd HH:mm:ss", Locale.ROOT))
		.append(" ").append(r.threadID).append(" ")

		val className = shortClassName(r.sourceClassName)

+9 −2

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ import android.content.pm.PackageManager
		import android.net.ConnectivityManager
		import android.os.Build
		import android.os.Bundle
		import android.os.LocaleList
		import android.os.PowerManager
		import android.provider.CalendarContract
		import android.provider.ContactsContract
		@@ -60,6 +61,7 @@ import org.apache.commons.io.IOUtils
		import org.apache.commons.lang3.exception.ExceptionUtils
		import org.dmfs.tasks.contract.TaskContract
		import java.io.*
		import java.util.*
		import java.util.logging.Level
		import java.util.zip.ZipEntry
		import java.util.zip.ZipOutputStream
		@@ -325,10 +327,15 @@ class DebugInfoActivity: AppCompatActivity() {
		}

		// system info
		val locales: Any = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
		LocaleList.getAdjustedDefault()
		else
		Locale.getDefault()
		writer.append(
		"SYSTEM INFORMATION\n\n" +
		"\nSYSTEM INFORMATION\n\n" +
		"Android version: ${Build.VERSION.RELEASE} (${Build.DISPLAY})\n" +
		"Device: ${Build.MANUFACTURER} ${Build.MODEL} (${Build.DEVICE})\n\n"
		"Device: ${Build.MANUFACTURER} ${Build.MODEL} (${Build.DEVICE})\n" +
		"Locale(s): $locales\n\n"
		)

		// connectivity

Original line number	Diff line number	Diff line
		Subproject commit 37984d0d0ba234c7111297496d771f8915b02b2e
		Subproject commit b22853c12d0d5906d0a1b22e213ccf6fa7f17103