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

for debug builds, check for upgrades hourly

Browse source
This commit is contained in:
Eric House 2020-08-13 09:15:25 -07:00
parent adc8c8d961
commit 5d305f7df7
10 changed files with 20 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -89,6 +89,7 @@ android {
buildConfigField "String", "KEY_FCMID", "\"FBMService_fcmid\""
buildConfigField "boolean", "ATTACH_SUPPORTED", "false"
buildConfigField "boolean", "OFFER_MQTT", "true"
buildConfigField "boolean", "NON_RELEASE", "DEBUG || !IS_TAGGED_BUILD"
}
xw4NoSMS {

2
xwords4/android/app/src/main/java/org/eehouse/android/xw4/Assert.java
View file

@ -45,7 +45,7 @@ public class Assert {
// NR: non-release
public static void assertTrueNR( boolean val )
{
if ( BuildConfig.DEBUG || !BuildConfig.IS_TAGGED_BUILD ) {
if ( BuildConfig.NON_RELEASE ) {
assertTrue( val );
}
}

2
xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameListItem.java
View file

@ -334,7 +334,7 @@ public class GameListItem extends LinearLayout
// temporarily after every game closes because an *already-open*
// game always tests as not safe-to-open.
boolean doShow = false;
boolean quarantined = (BuildConfig.DEBUG || !BuildConfig.IS_TAGGED_BUILD)
boolean quarantined = BuildConfig.NON_RELEASE
&& !Quarantine.safeToOpen( m_rowid );
ImageView iv = (ImageView)findViewById( R.id.has_chat_marker );
if ( quarantined ) {

3
xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameLock.java
View file

@ -52,8 +52,7 @@ import androidx.annotation.NonNull;
public class GameLock implements AutoCloseable {
private static final String TAG = GameLock.class.getSimpleName();
private static final boolean GET_OWNER_STACK =
BuildConfig.DEBUG || !BuildConfig.IS_TAGGED_BUILD;
private static final boolean GET_OWNER_STACK = BuildConfig.NON_RELEASE;
private static final boolean DEBUG_LOCKS = false;
// private static final long ASSERT_TIME = 2000;

2
xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameUtils.java
View file

@ -108,7 +108,7 @@ public class GameUtils {
String msg = "savedGame(): unable to get lock; holder dump: "
+ GameLock.getHolderDump( rowid );
Log.d( TAG, msg );
if ( BuildConfig.DEBUG || !BuildConfig.IS_TAGGED_BUILD ) {
if ( BuildConfig.NON_RELEASE ) {
Utils.emailAuthor( context, msg );
}
throw new NoSuchGameException( rowid );

2
xwords4/android/app/src/main/java/org/eehouse/android/xw4/InviteChoicesAlert.java
View file

@ -65,7 +65,7 @@ public class InviteChoicesAlert extends DlgDelegateAlert {
if ( Utils.deviceSupportsNBS(context) ) {
add( items, means, R.string.invite_choice_data_sms, InviteMeans.SMS_DATA );
}
if ( BuildConfig.DEBUG || !BuildConfig.IS_TAGGED_BUILD ) {
if ( BuildConfig.NON_RELEASE ) {
add( items, means, R.string.invite_choice_relay, InviteMeans.RELAY );
}
if ( BuildConfig.OFFER_MQTT ) {

3
xwords4/android/app/src/main/java/org/eehouse/android/xw4/Log.java
View file

@ -40,8 +40,7 @@ public class Log {
private static final String TAG = Log.class.getSimpleName();
private static final String PRE_TAG = BuildConfig.FLAVOR + "-";
private static final String KEY_USE_DB = TAG + "/useDB";
private static final boolean LOGGING_ENABLED
= BuildConfig.DEBUG || !BuildConfig.IS_TAGGED_BUILD;
private static final boolean LOGGING_ENABLED = BuildConfig.NON_RELEASE;
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";

3
xwords4/android/app/src/main/java/org/eehouse/android/xw4/MQTTInviteDelegate.java
View file

@ -30,8 +30,7 @@ import org.eehouse.android.xw4.jni.XwJNI;
public class MQTTInviteDelegate extends DevIDInviteDelegate {
private static final String TAG = MQTTInviteDelegate.class.getSimpleName();
private static final String RECS_KEY = TAG + "/recs";
private static final boolean MQTTINVITE_SUPPORTED
= BuildConfig.DEBUG || !BuildConfig.IS_TAGGED_BUILD;
private static final boolean MQTTINVITE_SUPPORTED = BuildConfig.NON_RELEASE;
private String m_devIDStr;

3
xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayInviteDelegate.java
View file

@ -29,8 +29,7 @@ import org.eehouse.android.xw4.DBUtils.SentInvitesInfo;
public class RelayInviteDelegate extends DevIDInviteDelegate {
private static final String TAG = RelayInviteDelegate.class.getSimpleName();
private static final String RECS_KEY = TAG + "/recs";
private static final boolean RELAYINVITE_SUPPORTED
= BuildConfig.DEBUG || !BuildConfig.IS_TAGGED_BUILD;
private static final boolean RELAYINVITE_SUPPORTED = BuildConfig.NON_RELEASE;
private boolean m_immobileConfirmed;
private String mRelayDevIDStr;

15
xwords4/android/app/src/main/java/org/eehouse/android/xw4/UpdateCheckReceiver.java
View file

@ -46,8 +46,9 @@ public class UpdateCheckReceiver extends BroadcastReceiver {
public static final String NEW_DICT_NAME = "NEW_DICT_NAME";
public static final String NEW_XLATION_CBK = "NEW_XLATION_CBK";
private static final long INTERVAL_ONEHOUR = 1000 * 60 * 60;
// weekly
private static final long INTERVAL_ONEDAY = 1000 * 60 * 60 * 24;
private static final long INTERVAL_ONEDAY = INTERVAL_ONEHOUR * 24;
private static final long INTERVAL_NDAYS = 7;
// constants that are also used in info.py
@ -93,10 +94,16 @@ public class UpdateCheckReceiver extends BroadcastReceiver {
PendingIntent pi = PendingIntent.getBroadcast( context, 0, intent, 0 );
am.cancel( pi );
long interval_millis = INTERVAL_ONEDAY;
if ( !devOK( context ) ) {
interval_millis *= INTERVAL_NDAYS;
long interval_millis;
if ( BuildConfig.NON_RELEASE ) {
interval_millis = INTERVAL_ONEHOUR;
} else {
interval_millis = INTERVAL_ONEDAY;
if ( !devOK( context ) ) {
interval_millis *= INTERVAL_NDAYS;
}
}
interval_millis = (interval_millis / 2)
+ Math.abs(Utils.nextRandomInt() % interval_millis);
am.setInexactRepeating( AlarmManager.ELAPSED_REALTIME_WAKEUP,