Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2024-12-28 09:58:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'android_branch' into android_bt

Browse source
This commit is contained in:
Eric House 2012-02-07 06:21:13 -08:00
commit bde5910c2a
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
xwords4/android/XWords4/res/raw/changes
View file

@ -7,6 +7,7 @@
<body> <body>
<b>Crosswords 4.4 beta 42 release</b> <b>Crosswords 4.4 beta 42 release</b>
<ul> <ul>
<li>Fix nasty Ice Cream Sandwich crash -- my bad</li>
<li>Improve network game startup</li> <li>Improve network game startup</li>
<li>Include room name in invitation email subject</li> <li>Include room name in invitation email subject</li>
</ul> </ul>

4
xwords4/android/XWords4/src/org/eehouse/android/xw4/RelayReceiver.java
View file

@ -69,9 +69,9 @@ public class RelayReceiver extends BroadcastReceiver {
PendingIntent pi = PendingIntent.getBroadcast( context, 0, intent, 0 ); PendingIntent pi = PendingIntent.getBroadcast( context, 0, intent, 0 );
if ( force || interval_millis > 0 ) { if ( force || interval_millis > 0 ) {
long first_millis = SystemClock.elapsedRealtime(); long first_millis = 0;
if ( !force ) { if ( !force ) {
first_millis += interval_millis; first_millis = SystemClock.elapsedRealtime() + interval_millis;
} }
am.setInexactRepeating( AlarmManager.ELAPSED_REALTIME_WAKEUP, am.setInexactRepeating( AlarmManager.ELAPSED_REALTIME_WAKEUP,
first_millis, // first firing first_millis, // first firing