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

Commit 7c48d43e authored by Marvin W.'s avatar Marvin W. 🐿️
Browse files

Java 6 compat

parent bd1be63f

GmsApi @ deb757ed

Compare 89280531 to deb757ed
Original line number Diff line number Diff line 
Subproject commit 8928053170b6a819befa297f264e5ba7e2f9342b
 
Subproject commit deb757edfb0684f41ccc493b7c35a98878571a56

UnifiedNlp @ 9bd476a0

Compare 11435507 to 9bd476a0
Original line number Diff line number Diff line 
Subproject commit 114355071bfc42a4306556381c0d0040d9ae44ff
 
Subproject commit 9bd476a0498cf6f5ef0fb82108955751445c176a

play-services-core/build.gradle

+7 −8
Original line number Diff line number Diff line
@@ -35,19 +35,15 @@ repositories { 
dependencies {

    compile 'com.android.support:support-v4:22.0.0'

    compile 'com.android.support:appcompat-v7:22.0.0'



    compile 'de.hdodenhof:circleimageview:1.2.1'

    compile 'com.squareup.wire:wire-runtime:1.6.1'



    compile project(':play-services-api')

    compile project(':unifiednlp-base')



    // vtm from ./libs

    compile group: 'org.oscim', name: 'vtm-android', version: '0.6.0-SNAPSHOT', ext: 'aar'

    compile group: 'org.oscim', name: 'vtm-themes', version: '0.6.0-SNAPSHOT'

    compile group: 'org.oscim', name: 'vtm-extras', version: '0.6.0-SNAPSHOT'

    compile group: 'org.oscim', name: 'vtm', version: '0.6.0-SNAPSHOT'



    compile 'org.oscim:vtm-android:0.6.0-SNAPSHOT@aar'

    compile 'org.oscim:vtm-themes:0.6.0-SNAPSHOT'

    compile 'org.oscim:vtm-extras:0.6.0-SNAPSHOT'

    compile 'org.oscim:vtm:0.6.0-SNAPSHOT'

    // Dependencies for vtm

    compile 'com.fasterxml.jackson.core:jackson-core:2.3.0'

    compile 'com.vividsolutions:jts:1.13'
@@ -65,6 +61,9 @@ android { 
            java.srcDirs += 'src/main/protos-java'

        }

    }

    compileOptions {

        sourceCompatibility JavaVersion.VERSION_1_6

    }

}



if (file('user.gradle').exists()) {

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

+2 −2
Original line number Diff line number Diff line
@@ -40,11 +40,11 @@ public abstract class AbstractGmsServiceBroker extends IGmsServiceBroker.Stub { 
    private final Set<Integer> supportedServiceIds;



    public AbstractGmsServiceBroker(Integer supportedServiceId, Integer... supportedServiceIds) {

        this(new HashSet<>(combine(supportedServiceId, supportedServiceIds)));

        this(combine(supportedServiceId, supportedServiceIds));

    }



    private static Set<Integer> combine(Integer i, Integer... is) {

        Set<Integer> integers = new HashSet<>(Arrays.asList(is));

        Set<Integer> integers = new HashSet<Integer>(Arrays.asList(is));

        integers.add(i);

        return integers;

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ public class CheckinManager { 
        LastCheckinInfo info = LastCheckinInfo.read(context);

        if (!force && info.lastCheckin > System.currentTimeMillis() - MIN_CHECKIN_INTERVAL)

            return null;

        List<CheckinClient.Account> accounts = new ArrayList<>();

        List<CheckinClient.Account> accounts = new ArrayList<CheckinClient.Account>();

        AccountManager accountManager = AccountManager.get(context);

        String accountType = context.getString(R.string.google_account_type);

        for (Account account : accountManager.getAccountsByType(accountType)) {