Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-08 05:24:39 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

change file name (nothing else)

Browse source
This commit is contained in:
Eric House 2020-06-09 16:04:29 -07:00
parent 436d3c2ad0
commit 699eef79cb
6 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
xwords4/android/app/src/main/AndroidManifest.xml
View file

@ -138,7 +138,7 @@
<action android:name="android.intent.action.MY_PACKAGE_REPLACED" /> <action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
</intent-filter> </intent-filter>
</receiver> </receiver>
<receiver android:name="RelayReceiver"/> <receiver android:name="RelayTimerReceiver"/>
<receiver android:name="NagTurnReceiver"/> <receiver android:name="NagTurnReceiver"/>
<receiver android:name="SMSResendReceiver"/> <receiver android:name="SMSResendReceiver"/>
<receiver android:name="DupeModeTimer"/> <receiver android:name="DupeModeTimer"/>

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

@ -372,7 +372,7 @@ public class DBUtils {
} }
if ( needsTimer ) { if ( needsTimer ) {
RelayReceiver.setTimer( context ); RelayTimerReceiver.setTimer( context );
} }
} // saveSummary } // saveSummary

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

@ -45,7 +45,7 @@ public class OnBootReceiver extends BroadcastReceiver {
protected static void startTimers( Context context ) protected static void startTimers( Context context )
{ {
NagTurnReceiver.restartTimer( context ); NagTurnReceiver.restartTimer( context );
RelayReceiver.setTimer( context ); RelayTimerReceiver.setTimer( context );
SMSResendReceiver.setTimer( context ); SMSResendReceiver.setTimer( context );
} }
} }

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

@ -50,7 +50,7 @@ public class PollListPreference extends ListPreference
{ {
String valstr = (String)newValue; String valstr = (String)newValue;
int val = Integer.parseInt(valstr); int val = Integer.parseInt(valstr);
RelayReceiver.setTimer( m_context, val * 1000 ); RelayTimerReceiver.setTimer( m_context, val * 1000 );
setSummaryToMatch( valstr ); setSummaryToMatch( valstr );
return true; return true;

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

@ -423,7 +423,7 @@ public class RelayService extends XWJIService
if ( shouldMaintainConnection() ) { if ( shouldMaintainConnection() ) {
long interval_millis = getMaxIntervalSeconds() * 1000; long interval_millis = getMaxIntervalSeconds() * 1000;
RelayReceiver.setTimer( this, interval_millis ); RelayTimerReceiver.setTimer( this, interval_millis );
// Log.d( TAG, "onDestroy(): rescheduling in %d ms", // Log.d( TAG, "onDestroy(): rescheduling in %d ms",
// interval_millis ); // interval_millis );
} }
@ -517,7 +517,7 @@ public class RelayService extends XWJIService
} else if ( registerWithRelayIfNot( timestamp ) ) { } else if ( registerWithRelayIfNot( timestamp ) ) {
requestMessages( timestamp ); requestMessages( timestamp );
} }
RelayReceiver.setTimer( this ); RelayTimerReceiver.setTimer( this );
break; break;
case STOP: case STOP:
stopThreads(); stopThreads();
@ -1713,7 +1713,7 @@ public class RelayService extends XWJIService
* *
* Goal: maintain connection by keeping this service alive with * Goal: maintain connection by keeping this service alive with
* its periodic pings to relay. When it dies or is killed, * its periodic pings to relay. When it dies or is killed,
* notice, and use RelayReceiver's timer to get it restarted a bit * notice, and use RelayTimerReceiver's timer to get it restarted a bit
* later. But note: s_lastFCM will not be set when the app is * later. But note: s_lastFCM will not be set when the app is
* relaunched. * relaunched.
*/ */

6
xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayReceiver.java → xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayTimerReceiver.java
View file

@ -27,8 +27,8 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.os.SystemClock; import android.os.SystemClock;
public class RelayReceiver extends BroadcastReceiver { public class RelayTimerReceiver extends BroadcastReceiver {
private static final String TAG = RelayReceiver.class.getSimpleName(); private static final String TAG = RelayTimerReceiver.class.getSimpleName();
@Override @Override
public void onReceive( Context context, Intent intent ) public void onReceive( Context context, Intent intent )
@ -47,7 +47,7 @@ public class RelayReceiver extends BroadcastReceiver {
AlarmManager am = AlarmManager am =
(AlarmManager)context.getSystemService( Context.ALARM_SERVICE ); (AlarmManager)context.getSystemService( Context.ALARM_SERVICE );
Intent intent = new Intent( context, RelayReceiver.class ); Intent intent = new Intent( context, RelayTimerReceiver.class );
PendingIntent pi = PendingIntent.getBroadcast( context, 0, intent, 0 ); PendingIntent pi = PendingIntent.getBroadcast( context, 0, intent, 0 );
// Check if we have any relay IDs, since we'll be using them to // Check if we have any relay IDs, since we'll be using them to