Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-23 07:27:22 +01:00
Code Issues Projects Releases Packages Wiki Activity

set dbname in build.gradle

Browse source
This commit is contained in:
Eric House 2019-06-28 15:28:55 -07:00 • committed by Eric House
parent ee9f3c36f8
commit 2d81135487
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
xwords4/android/app/build.gradle
View file

@ -67,6 +67,7 @@ android {
flavorDimensions "variant"//, "abi" flavorDimensions "variant"//, "abi"
productFlavors { productFlavors {
all { all {
buildConfigField "String", "DB_NAME", "\"xwdb\"";
buildConfigField "String", "BUILD_INFO_NAME", "\"${BUILD_INFO_NAME}\"" buildConfigField "String", "BUILD_INFO_NAME", "\"${BUILD_INFO_NAME}\""
buildConfigField "boolean", "IS_TAGGED_BUILD", "${CURTAG}" == '' ? "false" : "true" buildConfigField "boolean", "IS_TAGGED_BUILD", "${CURTAG}" == '' ? "false" : "true"
resValue "string", "invite_prefix", "/and/" resValue "string", "invite_prefix", "/and/"
@ -102,6 +103,7 @@ android {
} }
xw4d { xw4d {
dimension "variant" dimension "variant"
buildConfigField "String", "DB_NAME", "\"xwddb\"";
applicationId "org.eehouse.android.xw4dbg" applicationId "org.eehouse.android.xw4dbg"
manifestPlaceholders = [ FABRIC_API_KEY: "$FABRIC_API_KEY", APP_ID: applicationId, ] manifestPlaceholders = [ FABRIC_API_KEY: "$FABRIC_API_KEY", APP_ID: applicationId, ]
resValue "string", "app_name", "CrossDbg" resValue "string", "app_name", "CrossDbg"
@ -116,6 +118,7 @@ android {
xw4dNoSMS { xw4dNoSMS {
dimension "variant" dimension "variant"
buildConfigField "String", "DB_NAME", "\"xwddb\"";
applicationId "org.eehouse.android.xw4dbg" applicationId "org.eehouse.android.xw4dbg"
manifestPlaceholders = [ FABRIC_API_KEY: "$FABRIC_API_KEY", APP_ID: applicationId, ] manifestPlaceholders = [ FABRIC_API_KEY: "$FABRIC_API_KEY", APP_ID: applicationId, ]
resValue "string", "app_name", "CrossDbg" resValue "string", "app_name", "CrossDbg"

6
xwords4/android/app/src/main/java/org/eehouse/android/xw4/DBHelper.java
View file

@ -46,7 +46,7 @@ public class DBHelper extends SQLiteOpenHelper {
public static final String TABLE_NAME_INVITES = "invites"; public static final String TABLE_NAME_INVITES = "invites";
public static final String TABLE_NAME_CHAT = "chat"; public static final String TABLE_NAME_CHAT = "chat";
public static final String TABLE_NAME_LOGS = "logs"; public static final String TABLE_NAME_LOGS = "logs";
private static final String DB_NAME = "xwdb"; private static final String DB_NAME = BuildConfig.DB_NAME;
private static final int DB_VERSION = 29; private static final int DB_VERSION = 29;
public static final String GAME_NAME = "GAME_NAME"; public static final String GAME_NAME = "GAME_NAME";
@ -233,7 +233,7 @@ public class DBHelper extends SQLiteOpenHelper {
public DBHelper( Context context ) public DBHelper( Context context )
{ {
super( context, DB_NAME, null, DB_VERSION ); super( context, getDBName(), null, DB_VERSION );
m_context = context; m_context = context;
} }
@ -263,7 +263,7 @@ public class DBHelper extends SQLiteOpenHelper {
@SuppressWarnings("fallthrough") @SuppressWarnings("fallthrough")
public void onUpgrade( SQLiteDatabase db, int oldVersion, int newVersion ) public void onUpgrade( SQLiteDatabase db, int oldVersion, int newVersion )
{ {
Log.i( TAG, "onUpgrade: old: %d; new: %d", oldVersion, newVersion ); Log.i( TAG, "onUpgrade(%s): old: %d; new: %d", db, oldVersion, newVersion );
boolean madeSumTable = false; boolean madeSumTable = false;
boolean madeChatTable = false; boolean madeChatTable = false;