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

Verified Commit f8a0c9c4 authored by Marvin W.'s avatar Marvin W. 🐿️
Browse files

Small bug fixes

parent bf88e7c8

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

+1 −0
Original line number Diff line number Diff line
@@ -664,6 +664,7 @@ 
                <action android:name="com.google.android.gms.herrevad.services.LightweightNetworkQualityAndroidService.START"/>

                <action android:name="com.google.android.gms.phenotype.service.START"/>

                <action android:name="com.google.android.gms.auth.api.credentials.service.START"/>

                <action android:name="com.google.android.gms.gass.START"/>

            </intent-filter>

        </service>

    </application>

play-services-core/src/main/java/org/microg/gms/people/ContactSyncService.java

+14 −1
Original line number Diff line number Diff line
@@ -16,15 +16,28 @@ 


package org.microg.gms.people;



import android.accounts.Account;

import android.app.Service;

import android.content.AbstractThreadedSyncAdapter;

import android.content.ContentProviderClient;

import android.content.Intent;

import android.content.SyncResult;

import android.os.Bundle;

import android.os.IBinder;

import android.support.annotation.Nullable;

import android.util.Log;



public class ContactSyncService extends Service {

    private static final String TAG = "GmsContactSync";



    @Nullable

    @Override

    public IBinder onBind(Intent intent) {

        return null;

        return (new AbstractThreadedSyncAdapter(this, true) {

            @Override

            public void onPerformSync(Account account, Bundle extras, String authority, ContentProviderClient provider, SyncResult syncResult) {

                Log.d(TAG, "unimplemented Method: onPerformSync");

            }

        }).getSyncAdapterBinder();

    }

}

play-services-core/src/main/java/org/microg/gms/ui/Conditions.java

+9 −4
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.app.Activity; 
import android.content.Context;

import android.content.Intent;

import android.net.Uri;

import android.os.Build;

import android.os.PowerManager;

import android.provider.Settings;

import android.support.v4.app.ActivityCompat;
@@ -32,7 +33,9 @@ import org.microg.gms.gcm.GcmPrefs; 
import org.microg.tools.ui.Condition;



import static android.Manifest.permission.ACCESS_COARSE_LOCATION;

import static android.Manifest.permission.ACCESS_FINE_LOCATION;

import static android.Manifest.permission.GET_ACCOUNTS;

import static android.Manifest.permission.READ_EXTERNAL_STORAGE;

import static android.Manifest.permission.READ_PHONE_STATE;

import static android.Manifest.permission.WRITE_EXTERNAL_STORAGE;

import static android.content.pm.PackageManager.PERMISSION_GRANTED;
@@ -61,7 +64,7 @@ public class Conditions { 
                }

            }).build();



    private static final String[] REQUIRED_PERMISSIONS = new String[]{ACCESS_COARSE_LOCATION, WRITE_EXTERNAL_STORAGE, GET_ACCOUNTS, READ_PHONE_STATE};

    private static final String[] REQUIRED_PERMISSIONS = new String[]{ACCESS_COARSE_LOCATION, ACCESS_FINE_LOCATION, READ_EXTERNAL_STORAGE, WRITE_EXTERNAL_STORAGE, GET_ACCOUNTS, READ_PHONE_STATE};

    public static final Condition PERMISSIONS = new Condition.Builder()

            .title(R.string.cond_perm_title)

            .summaryPlurals(R.plurals.cond_perm_summary)
@@ -70,10 +73,12 @@ public class Conditions { 
                @Override

                public boolean isActive(Context context) {

                    count = 0;

                    if (SDK_INT >= Build.VERSION_CODES.M) {

                        for (String permission : REQUIRED_PERMISSIONS) {

                            if (ContextCompat.checkSelfPermission(context, permission) != PERMISSION_GRANTED)

                                count++;

                        }

                    }

                    return count > 0;

                }