From 9f92bce8807d9b6bff42d86b4b17e9d25971426a Mon Sep 17 00:00:00 2001 From: Eric House Date: Fri, 17 Apr 2020 20:29:47 -0700 Subject: [PATCH] name exported file based on FLAVOR --- .../app/src/main/java/org/eehouse/android/xw4/Log.java | 3 ++- .../src/main/java/org/eehouse/android/xw4/jni/DUtilCtxt.java | 5 ++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Log.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Log.java index 833443578..57fc6ee95 100644 --- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Log.java +++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Log.java @@ -43,6 +43,7 @@ public class Log { private static final boolean LOGGING_ENABLED = BuildConfig.DEBUG || !BuildConfig.IS_TAGGED_BUILD; private static final boolean ERROR_LOGGING_ENABLED = true; + private static final String LOGS_FILE_NAME = BuildConfig.FLAVOR + "_logsDB.txt"; private static final String LOGS_DB_NAME = "xwlogs_db"; private static final String LOGS_TABLE_NAME = "logs"; private static final String COL_ENTRY = "entry"; @@ -259,7 +260,7 @@ public class Log { { File dir = Environment.getExternalStorageDirectory(); dir = new File( dir, Environment.DIRECTORY_DOWNLOADS ); - File db = new File( dir, LOGS_DB_NAME + ".txt" ); + File db = new File( dir, LOGS_FILE_NAME ); try { OutputStream os = new FileOutputStream( db ); diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/DUtilCtxt.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/DUtilCtxt.java index a3ea4b68d..31c4e504b 100644 --- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/DUtilCtxt.java +++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/DUtilCtxt.java @@ -123,9 +123,8 @@ public class DUtilCtxt { private static final int STRSD_DUP_ONESCORE = 29; private static final int STR_PENDING_PLAYER = 30; - public String getUserString( int stringCode ) + public String getUserString( final int stringCode ) { - Log.d( TAG, "getUserString(%d)", stringCode ); int id = 0; switch( stringCode ) { case STR_ROBOT_MOVED: @@ -217,7 +216,7 @@ public class DUtilCtxt { } String result = (0 == id) ? "" : LocUtils.getString( m_context, id ); - Log.d( TAG, "getUserString() => %s", result ); + Log.d( TAG, "getUserString(%d) => %s", stringCode, result ); return result; }