From 35cc3d31900a8b751c258f1d05350b0562b33bac Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Thu, 5 Jun 2014 19:01:36 +0200
Subject: Disable GMS

---
 main/src/main/AndroidManifest.xml                                 | 2 +-
 main/src/main/java/de/blinkt/openvpn/fragments/AboutFragment.java | 4 +++-
 main/src/main/res/layout/about.xml                                | 4 ----
 3 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'main')

diff --git a/main/src/main/AndroidManifest.xml b/main/src/main/AndroidManifest.xml
index 7043e94b..5d10abf3 100644
--- a/main/src/main/AndroidManifest.xml
+++ b/main/src/main/AndroidManifest.xml
@@ -10,7 +10,7 @@
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 
-    <uses-permission android:name="com.android.vending.BILLING" />
+    <!-- <uses-permission android:name="com.android.vending.BILLING" /> -->
 
     <!-- Copy the <permission> block to your app when using the REMOTE API. Otherwise OpenVPN for
         Android needs to be installed first -->
diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/AboutFragment.java b/main/src/main/java/de/blinkt/openvpn/fragments/AboutFragment.java
index a43bbbe8..6b26d718 100644
--- a/main/src/main/java/de/blinkt/openvpn/fragments/AboutFragment.java
+++ b/main/src/main/java/de/blinkt/openvpn/fragments/AboutFragment.java
@@ -264,7 +264,9 @@ public class AboutFragment extends Fragment implements View.OnClickListener {
         paypal.setMovementMethod(LinkMovementMethod.getInstance());
         gmsTextView = (TextView) v.findViewById(R.id.donategms);
         /* recreating view without onCreate/onDestroy cycle */
-        if (mService!=null)
+
+        // Disable GMS for now
+        if (mService!=null || false)
             initGooglePlayDonation();
 
         TextView translation = (TextView) v.findViewById(R.id.translation);
diff --git a/main/src/main/res/layout/about.xml b/main/src/main/res/layout/about.xml
index 46a5bec2..90267813 100644
--- a/main/src/main/res/layout/about.xml
+++ b/main/src/main/res/layout/about.xml
@@ -60,10 +60,6 @@
                 tools:ignore="SelectableText"/>
 
 
-        <Space
-                android:layout_width="match_parent"
-                android:layout_height="12sp" />
-
         <TextView
             android:id="@+id/translation"
             android:layout_width="match_parent"
-- 
cgit v1.2.3