diff --git a/src/googleplay/java/org/tasks/location/GeofenceApi.java b/src/googleplay/java/org/tasks/location/GeofenceApi.java index 9afee04f0..7ac4a9643 100644 --- a/src/googleplay/java/org/tasks/location/GeofenceApi.java +++ b/src/googleplay/java/org/tasks/location/GeofenceApi.java @@ -1,5 +1,6 @@ package org.tasks.location; +import android.annotation.SuppressLint; import android.app.PendingIntent; import android.content.Context; import android.content.Intent; @@ -50,6 +51,8 @@ public class GeofenceApi { newClient(new GoogleApi.GoogleApiClientConnectionHandler() { @Override public void onConnect(final GoogleApiClient client) { + @SuppressWarnings("ResourceType") + @SuppressLint("MissingPermission") PendingResult result = LocationServices.GeofencingApi.addGeofences( client, getRequests(geofences), diff --git a/src/googleplay/java/org/tasks/location/GoogleApi.java b/src/googleplay/java/org/tasks/location/GoogleApi.java index b6c484a67..c14d4f874 100644 --- a/src/googleplay/java/org/tasks/location/GoogleApi.java +++ b/src/googleplay/java/org/tasks/location/GoogleApi.java @@ -1,23 +1,15 @@ package org.tasks.location; import android.content.Context; -import android.location.Location; import android.os.Bundle; import com.google.android.gms.common.ConnectionResult; import com.google.android.gms.common.api.GoogleApiClient; -import com.google.android.gms.common.api.ResultCallback; import com.google.android.gms.location.LocationServices; -import com.google.android.gms.location.places.AutocompletePredictionBuffer; -import com.google.android.gms.location.places.PlaceBuffer; import com.google.android.gms.location.places.Places; -import com.google.android.gms.maps.model.LatLng; -import com.google.android.gms.maps.model.LatLngBounds; import org.tasks.injection.ForApplication; -import java.util.concurrent.TimeUnit; - import javax.inject.Inject; import timber.log.Timber; @@ -40,36 +32,6 @@ public class GoogleApi implements GoogleApiClient.ConnectionCallbacks { .addConnectionCallbacks(this); } - public void getPlaceDetails(final String placeId, final ResultCallback callback) { - Places.GeoDataApi.getPlaceById(googleApiClient, placeId).setResultCallback(new ResultCallback() { - @Override - public void onResult(PlaceBuffer places) { - callback.onResult(places); - } - }); - } - - public void getAutocompletePredictions(final String constraint, final ResultCallback callback) { - final LatLngBounds bounds = LatLngBounds.builder().include(getLastKnownLocation(googleApiClient)).build(); - Places.GeoDataApi.getAutocompletePredictions(googleApiClient, constraint, bounds, null) - .setResultCallback(new ResultCallback() { - @Override - public void onResult(AutocompletePredictionBuffer autocompletePredictions) { - callback.onResult(autocompletePredictions); - } - }, 15, TimeUnit.SECONDS); - } - - private LatLng getLastKnownLocation(GoogleApiClient googleApiClient) { - try { - Location lastLocation = LocationServices.FusedLocationApi.getLastLocation(googleApiClient); - return new LatLng(lastLocation.getLatitude(), lastLocation.getLongitude()); - } catch (Exception e) { - Timber.e(e, e.getMessage()); - return new LatLng(0, 0); - } - } - public void connect(final GoogleApiClientConnectionHandler googleApiClientConnectionHandler) { connect(googleApiClientConnectionHandler, new GoogleApiClient.OnConnectionFailedListener() { @Override @@ -79,15 +41,6 @@ public class GoogleApi implements GoogleApiClient.ConnectionCallbacks { }); } - public void connect(final GoogleApiClient.OnConnectionFailedListener onConnectionFailedListener) { - connect(new GoogleApiClientConnectionHandler() { - @Override - public void onConnect(GoogleApiClient client) { - Timber.i("onConnect(%s)", client); - } - }, onConnectionFailedListener); - } - private void connect(final GoogleApiClientConnectionHandler googleApiClientConnectionHandler, GoogleApiClient.OnConnectionFailedListener onConnectionFailedListener) { this.googleApiClientConnectionHandler = googleApiClientConnectionHandler; googleApiClient = builder @@ -96,10 +49,6 @@ public class GoogleApi implements GoogleApiClient.ConnectionCallbacks { googleApiClient.connect(); } - public void disconnect() { - googleApiClient.disconnect(); - } - @Override public void onConnected(Bundle bundle) { Timber.i("onConnected(Bundle)"); diff --git a/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java b/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java index 29e711263..f08b561ac 100644 --- a/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java +++ b/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java @@ -291,11 +291,12 @@ public class TaskListFragment extends InjectingListFragment implements SwipeRefr private void setupRefresh(SwipeRefreshLayout layout) { layout.setOnRefreshListener(this); - layout.setColorScheme( - R.color.importance_1, - R.color.importance_2, - R.color.importance_3, - R.color.importance_4); + Resources resources = getResources(); + layout.setColorSchemeColors( + resources.getColor(R.color.importance_1), + resources.getColor(R.color.importance_2), + resources.getColor(R.color.importance_3), + resources.getColor(R.color.importance_4)); } @Override diff --git a/src/main/java/com/todoroo/astrid/voice/VoiceOutputAssistant.java b/src/main/java/com/todoroo/astrid/voice/VoiceOutputAssistant.java index 368a68109..8245a30ed 100644 --- a/src/main/java/com/todoroo/astrid/voice/VoiceOutputAssistant.java +++ b/src/main/java/com/todoroo/astrid/voice/VoiceOutputAssistant.java @@ -53,7 +53,7 @@ public class VoiceOutputAssistant implements OnInitListener { mTts.setOnUtteranceCompletedListener(new TextToSpeech.OnUtteranceCompletedListener() { @Override public void onUtteranceCompleted(String utteranceId) { - Timber.d("%s: onUtteranceCompleted %s", utteranceId); + Timber.d("%s: onUtteranceCompleted", utteranceId); if(utteranceId.equals(id)) { shutdown(); }