Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0bc422c4 authored by Marvin W.'s avatar Marvin W. 🐿️
Browse files

Update checkin to latest version

parent f6dca1f1

play-services-core/build.gradle

+2 −2
Original line number Diff line number Diff line
@@ -57,8 +57,8 @@ dependencies { 
}



android {

    compileSdkVersion 21

    buildToolsVersion "21.1.2"

    compileSdkVersion 22

    buildToolsVersion "22.0.0"



    sourceSets {

        main {

play-services-core/src/main/AndroidManifest.xml

+5 −1
Original line number Diff line number Diff line
@@ -118,7 +118,11 @@ 


        <!-- Device Checkin -->



        <service android:name="org.microg.gms.checkin.CheckinService" />

        <service android:name="org.microg.gms.checkin.CheckinService">

            <intent-filter>

                <action android:name="com.google.android.gms.checkin.BIND_TO_SERVICE" />

            </intent-filter>

        </service>



        <receiver android:name="org.microg.gms.checkin.TriggerReceiver">

            <intent-filter>

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

+2 −0
Original line number Diff line number Diff line
@@ -61,6 +61,8 @@ public class CheckinManager { 
        info.lastCheckin = response.timeMs;

        info.securityToken = response.securityToken;

        info.digest = response.digest;

        info.versionInfo = response.versionInfo;

        info.deviceDataVersionInfo = response.deviceDataVersionInfo;

        info.write(context);



        ContentResolver resolver = context.getContentResolver();

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

+20 −0
Original line number Diff line number Diff line
@@ -20,14 +20,25 @@ import android.accounts.Account; 
import android.accounts.AccountManager;

import android.app.IntentService;

import android.content.Intent;

import android.os.IBinder;

import android.os.RemoteException;

import android.util.Log;



import com.google.android.gms.R;

import com.google.android.gms.checkin.internal.ICheckinService;



import org.microg.gms.people.PeopleManager;



public class CheckinService extends IntentService {

    private static final String TAG = "GmsCheckinSvc";

    public static final String BIND_ACTION = "com.google.android.gms.checkin.BIND_TO_SERVICE";



    private ICheckinService iface = new ICheckinService.Stub() {

        @Override

        public String getDeviceDataVersionInfo() throws RemoteException {

            return LastCheckinInfo.read(CheckinService.this).deviceDataVersionInfo;

        }

    };



    public CheckinService() {

        super(TAG);
@@ -49,4 +60,13 @@ public class CheckinService extends IntentService { 
        }

        stopSelf();

    }



    @Override

    public IBinder onBind(Intent intent) {

        if (BIND_ACTION.equals(intent.getAction())) {

            return iface.asBinder();

        } else {

            return super.onBind(intent);

        }

    }

}

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

+8 −0
Original line number Diff line number Diff line
@@ -25,11 +25,15 @@ public class LastCheckinInfo { 
    public static final String PREF_DIGEST = "digest";

    public static final String PREF_LAST_CHECKIN = "lastCheckin";

    public static final String PREF_SECURITY_TOKEN = "securityToken";

    public static final String PREF_VERSION_INFO = "versionInfo";

    public static final String PREF_DEVICE_DATA_VERSION_INFO = "deviceDataVersionInfo";

    public static final String INITIAL_DIGEST = "1-da39a3ee5e6b4b0d3255bfef95601890afd80709";

    public long lastCheckin;

    public long androidId;

    public long securityToken;

    public String digest;

    public String versionInfo;

    public String deviceDataVersionInfo;



    public static LastCheckinInfo read(Context context) {

        LastCheckinInfo info = new LastCheckinInfo();
@@ -38,6 +42,8 @@ public class LastCheckinInfo { 
        info.digest = preferences.getString(PREF_DIGEST, INITIAL_DIGEST);

        info.lastCheckin = preferences.getLong(PREF_LAST_CHECKIN, 0);

        info.securityToken = preferences.getLong(PREF_SECURITY_TOKEN, 0);

        info.versionInfo = preferences.getString(PREF_VERSION_INFO, "");

        info.deviceDataVersionInfo = preferences.getString(PREF_DEVICE_DATA_VERSION_INFO, "");

        return info;

    }
@@ -47,6 +53,8 @@ public class LastCheckinInfo { 
                .putString(PREF_DIGEST, digest)

                .putLong(PREF_LAST_CHECKIN, lastCheckin)

                .putLong(PREF_SECURITY_TOKEN, securityToken)

                .putString(PREF_VERSION_INFO, versionInfo)

                .putString(PREF_DEVICE_DATA_VERSION_INFO, deviceDataVersionInfo)

                .apply();

    }

}