From 7c48d43efcbd53143e9df3616d4838ebdac0205b Mon Sep 17 00:00:00 2001 From: mar-v-in Date: Mon, 13 Apr 2015 23:57:18 +0200 Subject: [PATCH] Java 6 compat --- extern/GmsApi | 2 +- extern/UnifiedNlp | 2 +- play-services-core/build.gradle | 15 +++++++-------- .../org/microg/gms/AbstractGmsServiceBroker.java | 4 ++-- .../org/microg/gms/checkin/CheckinManager.java | 2 +- .../microg/gms/common/DeviceConfiguration.java | 6 +++--- .../org/microg/gms/gservices/DatabaseHelper.java | 2 +- .../microg/gms/gservices/GServicesProvider.java | 4 ++-- .../gms/location/GoogleLocationManager.java | 2 +- .../microg/gms/location/RealLocationProvider.java | 2 +- .../main/java/org/microg/gms/maps/BackendMap.java | 4 ++-- .../gms/maps/bitmap/BitmapDescriptorImpl.java | 4 ++-- .../java/org/microg/gms/people/PeopleManager.java | 2 +- 13 files changed, 25 insertions(+), 26 deletions(-) diff --git a/extern/GmsApi b/extern/GmsApi index 89280531..deb757ed 160000 --- a/extern/GmsApi +++ b/extern/GmsApi @@ -1 +1 @@ -Subproject commit 8928053170b6a819befa297f264e5ba7e2f9342b +Subproject commit deb757edfb0684f41ccc493b7c35a98878571a56 diff --git a/extern/UnifiedNlp b/extern/UnifiedNlp index 11435507..9bd476a0 160000 --- a/extern/UnifiedNlp +++ b/extern/UnifiedNlp @@ -1 +1 @@ -Subproject commit 114355071bfc42a4306556381c0d0040d9ae44ff +Subproject commit 9bd476a0498cf6f5ef0fb82108955751445c176a diff --git a/play-services-core/build.gradle b/play-services-core/build.gradle index 270310c6..6c974e41 100644 --- a/play-services-core/build.gradle +++ b/play-services-core/build.gradle @@ -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()) { diff --git a/play-services-core/src/main/java/org/microg/gms/AbstractGmsServiceBroker.java b/play-services-core/src/main/java/org/microg/gms/AbstractGmsServiceBroker.java index 3ac14ec4..e6449e6c 100644 --- a/play-services-core/src/main/java/org/microg/gms/AbstractGmsServiceBroker.java +++ b/play-services-core/src/main/java/org/microg/gms/AbstractGmsServiceBroker.java @@ -40,11 +40,11 @@ public abstract class AbstractGmsServiceBroker extends IGmsServiceBroker.Stub { private final Set supportedServiceIds; public AbstractGmsServiceBroker(Integer supportedServiceId, Integer... supportedServiceIds) { - this(new HashSet<>(combine(supportedServiceId, supportedServiceIds))); + this(combine(supportedServiceId, supportedServiceIds)); } private static Set combine(Integer i, Integer... is) { - Set integers = new HashSet<>(Arrays.asList(is)); + Set integers = new HashSet(Arrays.asList(is)); integers.add(i); return integers; } diff --git a/play-services-core/src/main/java/org/microg/gms/checkin/CheckinManager.java b/play-services-core/src/main/java/org/microg/gms/checkin/CheckinManager.java index 1df15004..c59ee24b 100644 --- a/play-services-core/src/main/java/org/microg/gms/checkin/CheckinManager.java +++ b/play-services-core/src/main/java/org/microg/gms/checkin/CheckinManager.java @@ -42,7 +42,7 @@ public class CheckinManager { LastCheckinInfo info = LastCheckinInfo.read(context); if (!force && info.lastCheckin > System.currentTimeMillis() - MIN_CHECKIN_INTERVAL) return null; - List accounts = new ArrayList<>(); + List accounts = new ArrayList(); AccountManager accountManager = AccountManager.get(context); String accountType = context.getString(R.string.google_account_type); for (Account account : accountManager.getAccountsByType(accountType)) { diff --git a/play-services-core/src/main/java/org/microg/gms/common/DeviceConfiguration.java b/play-services-core/src/main/java/org/microg/gms/common/DeviceConfiguration.java index d4c9a117..336eeb3a 100644 --- a/play-services-core/src/main/java/org/microg/gms/common/DeviceConfiguration.java +++ b/play-services-core/src/main/java/org/microg/gms/common/DeviceConfiguration.java @@ -66,21 +66,21 @@ public class DeviceConfiguration { glEsVersion = configurationInfo.reqGlEsVersion; PackageManager packageManager = context.getPackageManager(); sharedLibraries = Arrays.asList(packageManager.getSystemSharedLibraryNames()); - availableFeatures = new ArrayList<>(); + availableFeatures = new ArrayList(); for (FeatureInfo featureInfo : packageManager.getSystemAvailableFeatures()) { if (featureInfo.name != null) availableFeatures.add(featureInfo.name); } if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { nativePlatforms = Arrays.asList(Build.SUPPORTED_ABIS); } else { - nativePlatforms = new ArrayList<>(); + nativePlatforms = new ArrayList(); nativePlatforms.add(Build.CPU_ABI); if (Build.CPU_ABI2 != null) nativePlatforms.add(Build.CPU_ABI2); } widthPixels = displayMetrics.widthPixels; heightPixels = displayMetrics.heightPixels; locales = Arrays.asList(context.getAssets().getLocales()); - glExtensions = new ArrayList<>(); + glExtensions = new ArrayList(); addEglExtensions(glExtensions); } diff --git a/play-services-core/src/main/java/org/microg/gms/gservices/DatabaseHelper.java b/play-services-core/src/main/java/org/microg/gms/gservices/DatabaseHelper.java index be3659bb..4db030bd 100644 --- a/play-services-core/src/main/java/org/microg/gms/gservices/DatabaseHelper.java +++ b/play-services-core/src/main/java/org/microg/gms/gservices/DatabaseHelper.java @@ -75,7 +75,7 @@ public class DatabaseHelper extends SQLiteOpenHelper { } public Map search(String search) { - Map map = new HashMap<>(); + Map map = new HashMap(); Cursor cursor = getReadableDatabase().query("overrides", new String[]{"name", "value"}, "name LIKE ?", new String[]{search}, null, null, null, null); if (cursor != null) { diff --git a/play-services-core/src/main/java/org/microg/gms/gservices/GServicesProvider.java b/play-services-core/src/main/java/org/microg/gms/gservices/GServicesProvider.java index 9dcc7d80..2c8dacf0 100644 --- a/play-services-core/src/main/java/org/microg/gms/gservices/GServicesProvider.java +++ b/play-services-core/src/main/java/org/microg/gms/gservices/GServicesProvider.java @@ -46,8 +46,8 @@ public class GServicesProvider extends ContentProvider { private static final String TAG = "GmsServicesProvider"; private DatabaseHelper databaseHelper; - private Map cache = new HashMap<>(); - private Set cachedPrefixes = new HashSet<>(); + private Map cache = new HashMap(); + private Set cachedPrefixes = new HashSet(); @Override public boolean onCreate() { diff --git a/play-services-core/src/main/java/org/microg/gms/location/GoogleLocationManager.java b/play-services-core/src/main/java/org/microg/gms/location/GoogleLocationManager.java index c7943a2d..bd7d427e 100644 --- a/play-services-core/src/main/java/org/microg/gms/location/GoogleLocationManager.java +++ b/play-services-core/src/main/java/org/microg/gms/location/GoogleLocationManager.java @@ -40,7 +40,7 @@ public class GoogleLocationManager implements LocationChangeListener { private RealLocationProvider gpsProvider; private RealLocationProvider networkProvider; private MockLocationProvider mockProvider; - private List currentRequests = new ArrayList<>(); + private List currentRequests = new ArrayList(); public GoogleLocationManager(Context context) { this.context = context; diff --git a/play-services-core/src/main/java/org/microg/gms/location/RealLocationProvider.java b/play-services-core/src/main/java/org/microg/gms/location/RealLocationProvider.java index 5fd4a45c..d5c61d0d 100644 --- a/play-services-core/src/main/java/org/microg/gms/location/RealLocationProvider.java +++ b/play-services-core/src/main/java/org/microg/gms/location/RealLocationProvider.java @@ -36,7 +36,7 @@ public class RealLocationProvider { private final AtomicBoolean connected = new AtomicBoolean(false); private long connectedMinTime; private float connectedMinDistance; - private List requests = new ArrayList<>(); + private List requests = new ArrayList(); private final LocationChangeListener changeListener; private LocationListener listener = new LocationListener() { @Override diff --git a/play-services-core/src/main/java/org/microg/gms/maps/BackendMap.java b/play-services-core/src/main/java/org/microg/gms/maps/BackendMap.java index e7854de6..df680523 100644 --- a/play-services-core/src/main/java/org/microg/gms/maps/BackendMap.java +++ b/play-services-core/src/main/java/org/microg/gms/maps/BackendMap.java @@ -53,7 +53,7 @@ public class BackendMap implements ItemizedLayer.OnItemGestureListener items; - private java.util.Map markupMap = new HashMap<>(); + private java.util.Map markupMap = new HashMap(); private boolean redrawPosted = false; public BackendMap(Context context) { @@ -68,7 +68,7 @@ public class BackendMap implements ItemizedLayer.OnItemGestureListener(mapView.map(), new MarkerSymbol(new AndroidBitmap(BitmapFactory + layers.add(items = new ItemizedLayer(mapView.map(), new MarkerSymbol(new AndroidBitmap(BitmapFactory .decodeResource(ResourcesContainer.get(), R.drawable.nop)), 0.5F, 1))); items.setOnItemGestureListener(this); mapView.map().setTheme(VtmThemes.DEFAULT); diff --git a/play-services-core/src/main/java/org/microg/gms/maps/bitmap/BitmapDescriptorImpl.java b/play-services-core/src/main/java/org/microg/gms/maps/bitmap/BitmapDescriptorImpl.java index 4acfac09..14750ac7 100644 --- a/play-services-core/src/main/java/org/microg/gms/maps/bitmap/BitmapDescriptorImpl.java +++ b/play-services-core/src/main/java/org/microg/gms/maps/bitmap/BitmapDescriptorImpl.java @@ -30,7 +30,7 @@ import java.util.Set; public class BitmapDescriptorImpl { private BitmapDescriptor descriptor; private boolean loadStarted = false; - private Set waitingForLoad = new HashSet<>(); + private Set waitingForLoad = new HashSet(); public BitmapDescriptorImpl(IObjectWrapper remoteObject) { this(new BitmapDescriptor(remoteObject)); @@ -41,7 +41,7 @@ public class BitmapDescriptorImpl { } public BitmapDescriptorImpl() { - this(new ObjectWrapper<>(new DefaultBitmapDescriptor(0))); + this(new ObjectWrapper(new DefaultBitmapDescriptor(0))); } public AbstractBitmapDescriptor getDescriptor() { diff --git a/play-services-core/src/main/java/org/microg/gms/people/PeopleManager.java b/play-services-core/src/main/java/org/microg/gms/people/PeopleManager.java index 254b0c71..348f384d 100644 --- a/play-services-core/src/main/java/org/microg/gms/people/PeopleManager.java +++ b/play-services-core/src/main/java/org/microg/gms/people/PeopleManager.java @@ -104,7 +104,7 @@ public class PeopleManager { DatabaseHelper databaseHelper = new DatabaseHelper(context); databaseHelper.putOwner(contentValues); databaseHelper.close(); - } catch (JSONException | IOException e) { + } catch (Exception e) { Log.w(TAG, e); } }