diff --git a/AndroidManifest.xml b/AndroidManifest.xml index e03e6ed5a..c5af270da 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -290,5 +290,6 @@ + diff --git a/AndroidManifest.xml.pattern b/AndroidManifest.xml.pattern index d385935e6..a1944e275 100644 --- a/AndroidManifest.xml.pattern +++ b/AndroidManifest.xml.pattern @@ -290,5 +290,6 @@ + diff --git a/project.properties b/project.properties index 41cfa65aa..98eab13a4 100644 --- a/project.properties +++ b/project.properties @@ -14,3 +14,4 @@ target=android-14 android.library.reference.1=third-party/AmbilWarna android.library.reference.2=third-party/drag-sort-listview/library android.library.reference.3=third-party/android-filechooser/code +android.library.reference.4=${google.services.lib.dir} diff --git a/src/org/geometerplus/android/fbreader/network/BearerAuthenticator.java b/src/org/geometerplus/android/fbreader/network/BearerAuthenticator.java index 1da6ec6e3..1562c1ae1 100644 --- a/src/org/geometerplus/android/fbreader/network/BearerAuthenticator.java +++ b/src/org/geometerplus/android/fbreader/network/BearerAuthenticator.java @@ -24,6 +24,8 @@ import java.util.Map; import android.app.Activity; import android.content.Intent; +import com.google.android.gms.common.ConnectionResult; +import com.google.android.gms.common.GooglePlayServicesUtil; import org.apache.http.client.CookieStore; import org.apache.http.cookie.Cookie; @@ -72,6 +74,17 @@ public class BearerAuthenticator extends ZLNetworkManager.BearerAuthenticator { @Override protected boolean authenticate(Map params) { + return GooglePlayServicesUtil.isGooglePlayServicesAvailable(myActivity) + == ConnectionResult.SUCCESS + ? authenticateToken(params) + : authenticateWeb(params); + } + + private boolean authenticateWeb(Map params) { + return false; + } + + private boolean authenticateToken(Map params) { return false; } }