Start McsService and CheckinService at boot. (01749d9e) · Commits · e / os / GmsCore

play-services-core/src/main/java/org/microg/gms/checkin/TriggerReceiver.java

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -27,11 +27,12 @@ import android.util.Log;
	public class TriggerReceiver extends WakefulBroadcastReceiver {		public class TriggerReceiver extends WakefulBroadcastReceiver {
	private static final String TAG = "GmsCheckinTrigger";		private static final String TAG = "GmsCheckinTrigger";
	public static final String PREF_ENABLE_CHECKIN = "checkin_enable_service";		public static final String PREF_ENABLE_CHECKIN = "checkin_enable_service";
			public static final String FORCE_TRY_RECONNECT = "org.microg.gms.checkin.FORCE_TRY_RECONNECT";
	private static final long REGULAR_CHECKIN_INTERVAL = 12 * 60 * 60 * 1000; // 12 hours		private static final long REGULAR_CHECKIN_INTERVAL = 12 * 60 * 60 * 1000; // 12 hours

	@Override		@Override
	public void onReceive(Context context, Intent intent) {		public void onReceive(Context context, Intent intent) {
	boolean force = "android.provider.Telephony.SECRET_CODE".equals(intent.getAction());		boolean force = "android.provider.Telephony.SECRET_CODE".equals(intent.getAction()) \|\| FORCE_TRY_RECONNECT.equals(intent.getAction());
	ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);		ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);

	if (PreferenceManager.getDefaultSharedPreferences(context).getBoolean(PREF_ENABLE_CHECKIN, true) \|\| force) {		if (PreferenceManager.getDefaultSharedPreferences(context).getBoolean(PREF_ENABLE_CHECKIN, true) \|\| force) {

play-services-core/src/main/java/org/microg/gms/gcm/GcmPrefs.java

+7 −7

Original line number	Original line	Diff line number	Diff line
	@@ -53,7 +53,7 @@ public class GcmPrefs implements SharedPreferences.OnSharedPreferenceChangeListe
	return INSTANCE;		return INSTANCE;
	}		}

	private int heartbeatMs = 300000;		private int heartbeatMs = 60000;
	private boolean gcmLogEnabled = true;		private boolean gcmLogEnabled = true;
	private String lastPersistedId = "";		private String lastPersistedId = "";
	private boolean confirmNewApps = false;		private boolean confirmNewApps = false;
	@@ -64,9 +64,9 @@ public class GcmPrefs implements SharedPreferences.OnSharedPreferenceChangeListe
	private int networkRoaming = 0;		private int networkRoaming = 0;
	private int networkOther = 0;		private int networkOther = 0;

	private int learntWifi = 300000;		private int learntWifi = 60000;
	private int learntMobile = 300000;		private int learntMobile = 60000;
	private int learntOther = 300000;		private int learntOther = 60000;

	private SharedPreferences defaultPreferences;		private SharedPreferences defaultPreferences;

	@@ -90,9 +90,9 @@ public class GcmPrefs implements SharedPreferences.OnSharedPreferenceChangeListe
	networkRoaming = Integer.parseInt(defaultPreferences.getString(PREF_NETWORK_ROAMING, "0"));		networkRoaming = Integer.parseInt(defaultPreferences.getString(PREF_NETWORK_ROAMING, "0"));
	networkOther = Integer.parseInt(defaultPreferences.getString(PREF_NETWORK_OTHER, "0"));		networkOther = Integer.parseInt(defaultPreferences.getString(PREF_NETWORK_OTHER, "0"));

	learntMobile = defaultPreferences.getInt(PREF_LEARNT_MOBILE, 300000);		learntMobile = defaultPreferences.getInt(PREF_LEARNT_MOBILE, 60000);
	learntWifi = defaultPreferences.getInt(PREF_LEARNT_WIFI, 300000);		learntWifi = defaultPreferences.getInt(PREF_LEARNT_WIFI, 60000);
	learntOther = defaultPreferences.getInt(PREF_LEARNT_OTHER, 300000);		learntOther = defaultPreferences.getInt(PREF_LEARNT_OTHER, 60000);
	}		}

	public int getHeartbeatMs() {		public int getHeartbeatMs() {

play-services-core/src/main/java/org/microg/gms/gcm/TriggerReceiver.java

+10 −0

Original line number	Original line	Diff line number	Diff line
	@@ -25,6 +25,8 @@ import android.support.v4.content.WakefulBroadcastReceiver;
	import android.util.Log;		import android.util.Log;

	import org.microg.gms.checkin.LastCheckinInfo;		import org.microg.gms.checkin.LastCheckinInfo;
			import org.microg.gms.gcm.McsService;
			import org.microg.gms.checkin.CheckinService;

	import static android.os.Build.VERSION.SDK_INT;		import static android.os.Build.VERSION.SDK_INT;
	import static android.os.Build.VERSION_CODES.N;		import static android.os.Build.VERSION_CODES.N;
	@@ -35,6 +37,7 @@ import static org.microg.gms.gcm.McsConstants.EXTRA_REASON;
	public class TriggerReceiver extends WakefulBroadcastReceiver {		public class TriggerReceiver extends WakefulBroadcastReceiver {
	private static final String TAG = "GmsGcmTrigger";		private static final String TAG = "GmsGcmTrigger";
	public static final String FORCE_TRY_RECONNECT = "org.microg.gms.gcm.FORCE_TRY_RECONNECT";		public static final String FORCE_TRY_RECONNECT = "org.microg.gms.gcm.FORCE_TRY_RECONNECT";
			public static final String TRY_RECONNECT = "org.microg.gms.gcm.TRY_RECONNECT";
	private static boolean registered = false;		private static boolean registered = false;

	/**		/**
	@@ -65,6 +68,13 @@ public class TriggerReceiver extends WakefulBroadcastReceiver {

	if (LastCheckinInfo.read(context).androidId == 0) {		if (LastCheckinInfo.read(context).androidId == 0) {
	Log.d(TAG, "Ignoring " + intent + ": need to checkin first.");		Log.d(TAG, "Ignoring " + intent + ": need to checkin first.");

			startWakefulService(context, new Intent(ACTION_CONNECT, null, context, McsService.class)
			.putExtra(EXTRA_REASON, intent));

			startWakefulService(context, new Intent(context, CheckinService.class)
			.putExtra(CheckinService.EXTRA_FORCE_CHECKIN, true));

	return;		return;
	}		}