mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-09 21:45:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "(Android) Backport"

Browse Source 
This reverts commit adf4bd753bf578987c6a107bc38fec288793d07e.
This commit is contained in:
twinaphex 2019-06-27 17:55:12 +02:00
parent a7e2c84939
commit 01c489eee0
1 changed files with 21 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
pkg/android/phoenix/src/com/retroarch/browser/retroactivity/RetroActivityLocation.java
View File

@ -1,10 +1,11 @@
package com.retroarch.browser.retroactivity; package com.retroarch.browser.retroactivity;
import com.google.android.gms.common.api.GoogleApiClient;
import com.google.android.gms.common.ConnectionResult; import com.google.android.gms.common.ConnectionResult;
import com.google.android.gms.common.GooglePlayServicesClient.ConnectionCallbacks;
import com.google.android.gms.common.GooglePlayServicesClient.OnConnectionFailedListener;
import com.google.android.gms.location.LocationClient;
import com.google.android.gms.location.LocationListener; import com.google.android.gms.location.LocationListener;
import com.google.android.gms.location.LocationRequest; import com.google.android.gms.location.LocationRequest;
import com.google.android.gms.location.LocationServices;
import com.retroarch.browser.preferences.util.UserPreferences; import com.retroarch.browser.preferences.util.UserPreferences;
import android.app.NativeActivity; import android.app.NativeActivity;
@ -15,19 +16,17 @@ import android.os.Bundle;
import android.util.Log; import android.util.Log;
import android.widget.Toast; import android.widget.Toast;
import android.content.pm.PackageManager;
import android.Manifest;
/** /**
* Class that implements location-based functionality for * Class that implements location-based functionality for
* the {@link RetroActivityFuture} activity. * the {@link RetroActivityFuture} and {@link RetroActivityPast}
* activities.
*/ */
public class RetroActivityLocation extends NativeActivity public class RetroActivityLocation extends NativeActivity
implements GoogleApiClient.ConnectionCallbacks, GoogleApiClient.OnConnectionFailedListener, LocationListener implements ConnectionCallbacks, OnConnectionFailedListener, LocationListener
{ {
/* LOCATION VARIABLES */ /* LOCATION VARIABLES */
private static int CONNECTION_FAILURE_RESOLUTION_REQUEST = 0; private static int CONNECTION_FAILURE_RESOLUTION_REQUEST = 0;
private GoogleApiClient mGoogleApiClient = null; private LocationClient mLocationClient = null;
private Location mCurrentLocation; private Location mCurrentLocation;
// Define an object that holds accuracy and frequency parameters // Define an object that holds accuracy and frequency parameters
@ -44,31 +43,24 @@ implements GoogleApiClient.ConnectionCallbacks, GoogleApiClient.OnConnectionFail
@Override @Override
public void onConnected(Bundle dataBundle) public void onConnected(Bundle dataBundle)
{ {
if (mGoogleApiClient == null) if (mLocationClient == null)
return; return;
// Display the connection status // Display the connection status
Toast.makeText(this, "Connected", Toast.LENGTH_SHORT).show(); Toast.makeText(this, "Connected", Toast.LENGTH_SHORT).show();
location_service_running = true; location_service_running = true;
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M)
{
if (checkSelfPermission(Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED)
{
// If already requested, start periodic updates // If already requested, start periodic updates
if (mUpdatesRequested) if (mUpdatesRequested)
{ {
LocationServices.FusedLocationApi.requestLocationUpdates( mLocationClient.requestLocationUpdates(mLocationRequest, this, null);
mGoogleApiClient, mLocationRequest, this);
} }
else else
{ {
// Get last known location // Get last known location
mCurrentLocation = LocationServices.FusedLocationApi.getLastLocation(mGoogleApiClient); mCurrentLocation = mLocationClient.getLastLocation();
locationChanged = true; locationChanged = true;
} }
}
}
} }
/** /**
@ -76,24 +68,23 @@ implements GoogleApiClient.ConnectionCallbacks, GoogleApiClient.OnConnectionFail
* location client drops because of an error. * location client drops because of an error.
*/ */
@Override @Override
public void onConnectionSuspended(int i) public void onDisconnected()
{ {
if (mGoogleApiClient == null) if (mLocationClient == null)
return; return;
// Display the connection status // Display the connection status
Toast.makeText(this, "Disconnected. Please re-connect.", Toast.LENGTH_SHORT).show(); Toast.makeText(this, "Disconnected. Please re-connect.", Toast.LENGTH_SHORT).show();
// If the client is connected // If the client is connected
if (mGoogleApiClient.isConnected()) if (mLocationClient.isConnected())
{ {
/* /*
* Remove location updates for a listener. * Remove location updates for a listener.
* The current Activity is the listener, so * The current Activity is the listener, so
* the argument is "this". * the argument is "this".
*/ */
LocationServices.FusedLocationApi.removeLocationUpdates( mLocationClient.removeLocationUpdates(this);
mGoogleApiClient, this);
} }
location_service_running = false; location_service_running = false;
@ -165,13 +156,8 @@ implements GoogleApiClient.ConnectionCallbacks, GoogleApiClient.OnConnectionFail
* Create a new location client, using the enclosing class to * Create a new location client, using the enclosing class to
* handle callbacks. * handle callbacks.
*/ */
if (mGoogleApiClient == null) { if (mLocationClient == null)
mGoogleApiClient = new GoogleApiClient.Builder(this) mLocationClient = new LocationClient(this, this, this);
.addApi(LocationServices.API)
.addConnectionCallbacks(this)
.addOnConnectionFailedListener(this)
.build();
}
// Start with updates turned off // Start with updates turned off
mUpdatesRequested = false; mUpdatesRequested = false;
@ -185,17 +171,17 @@ implements GoogleApiClient.ConnectionCallbacks, GoogleApiClient.OnConnectionFail
/** /**
* Executed upon starting the {@link GoogleApiClient}. * Executed upon starting the {@link LocationClient}.
*/ */
public void onLocationStart() public void onLocationStart()
{ {
if (mGoogleApiClient == null) if (mLocationClient == null)
return; return;
mUpdatesRequested = true; mUpdatesRequested = true;
// Connect the client. // Connect the client.
mGoogleApiClient.connect(); mLocationClient.connect();
} }
/** /**
@ -213,8 +199,8 @@ implements GoogleApiClient.ConnectionCallbacks, GoogleApiClient.OnConnectionFail
public void onLocationStop() public void onLocationStop()
{ {
// Disconnecting the client invalidates it. // Disconnecting the client invalidates it.
if (mGoogleApiClient != null && mUpdatesRequested) if (mLocationClient != null && mUpdatesRequested)
mGoogleApiClient.disconnect(); mLocationClient.disconnect();
} }
/** /**