Remove GPlayServices and Facebook API stuff. Update a library.

Updated okio to 1.2.0.

Removed Google Play Services references and directory.

Removed Facebook API code and directory containing it.

[email protected], [email protected]
BUG=

Review URL: https://de-novo-rietveld.appspot.com/7290001

Author: scrivener

apps/experimentalApp/AndroidManifest.xml

@@ -4,7 +4,6 @@
     android:versionCode="94"
     android:versionName="4.5.1" >
 
-  <uses-permission android:name="com.google.android.gms.permission.ACTIVITY_RECOGNITION"/>
   <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
   <uses-permission android:name="android.permission.CAMERA" />
@@ -17,12 +16,6 @@
   <uses-permission android:name="android.permission.READ_CONTACTS" />
   <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
   <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-  <uses-permission android:name="com.example.permission.MAPS_RECEIVE" />
-  <uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES" />
-
-  <permission
-      android:name="com.example.permission.MAPS_RECEIVE"
-      android:protectionLevel="signature" />
 
   <uses-sdk
       android:minSdkVersion="8"
@@ -112,11 +105,5 @@
         <category android:name="android.intent.category.LAUNCHER" />
       </intent-filter>
     </activity>
-    <meta-data
-        android:name="com.google.android.gms.version"
-        android:value="@integer/google_play_services_version" />
-    <meta-data
-        android:name="com.google.android.maps.v2.API_KEY"
-        android:value="AIzaSyDScwJ5PMiPC5bRRuFxfKiTvTfWZtRHzmE" />
   </application>
 </manifest>

java/org/denovogroup/rangzen/BUCK

@@ -28,7 +28,6 @@ android_library(
   visibility = [ 'PUBLIC' ],
   deps = [
     '//libs:android-support-v4',
-    '//ui/google-play-services_lib/libs:google-play-services',
     '//libs:gson',
     '//res/org/denovogroup/rangzen:res',
     '//java/com/github/kevinsawicki/http:httpRequest',

libs/BUCK

@@ -84,7 +84,7 @@ prebuilt_jar(
 
 prebuilt_jar(
   name = 'okio',
-  binary_jar = 'okio-1.0.1.jar',
+  binary_jar = 'okio-1.2.0.jar',
   visibility = [ 'PUBLIC' ],
 )
 

libs/okio-1.0.1.jar

@@ -13,12 +13,6 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES" />
-    <uses-permission android:name="com.example.permission.MAPS_RECEIVE" />
-
-    <permission
-        android:name="com.example.permission.MAPS_RECEIVE"
-        android:protectionLevel="signature" />
 
     <uses-feature
         android:glEsVersion="0x00020000"
@@ -51,17 +45,6 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name="com.facebook.LoginActivity" />
-        <activity
-            android:name="org.denovogroup.rangzen.MapsActivity"
-            android:label="@string/app_name"
-            android:theme="@style/NoActionBar" >
-            <intent-filter>
-                <action android:name="android.intent.action.DEFAULT" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
         <activity
             android:name="org.denovogroup.rangzen.AboutPage"
             android:label="@string/app_name"
@@ -73,15 +56,6 @@
             </intent-filter>
         </activity>
 
-        <meta-data
-            android:name="com.facebook.sdk.ApplicationId"
-            android:value="@string/app_id" />
-        <meta-data
-            android:name="com.google.android.gms.version"
-            android:value="@integer/google_play_services_version" />
-        <meta-data
-            android:name="com.google.android.maps.v2.API_KEY"
-            android:value="AIzaSyDScwJ5PMiPC5bRRuFxfKiTvTfWZtRHzmE" />
     </application>
 
 </manifest>

libs/okio-1.2.0.jar

@@ -5,7 +5,6 @@ android_resource(
   visibility = [ 'PUBLIC' ],
   deps = [
     '//ui/appcompat_v7_4:appcompatRes',
-    '//ui/google-play-services_lib:googlePlayServicesRes',
   ],
 )
 

ui/Rangzen/AndroidManifest.xml

@@ -14,6 +14,4 @@
 target=android-19
 android.library.reference.1=../appcompat_v7_4
 android.library.reference.2=../ViewPagerIndicator
-android.library.reference.3=../google-play-services_lib
-android.library.reference.4=../facebook
-android.library.reference.5=../../../../../../Downloads/zxing-2.3.0/android
+android.library.reference.3=../../../../../../Downloads/zxing-2.3.0/android

ui/Rangzen/BUCK

@@ -59,10 +59,14 @@ protected void onCreate(Bundle arg0) {
         button.setOnClickListener(new View.OnClickListener() { 
             @Override
             public void onClick(View v) {
-                Intent intent = new Intent();
-                intent.setClass(v.getContext(), MapsActivity.class);
-                startActivity(intent);
-                finish();
+                // TODO(Jesus): Update this activity to current needs.
+                // Doesn't need any buttons or anything, should have different text.
+                // Might also just want to remove it entirely?
+                //
+                // Intent intent = new Intent();
+                // intent.setClass(v.getContext(), MapsActivity.class);
+                // startActivity(intent);
+                // finish();
             }
         });
     }

ui/Rangzen/project.properties

@@ -11,7 +11,6 @@ android_library(
     'FragmentOrganizer.java',
     'IntroductionFragmentAdapter.java',
     'ListFragmentOrganizer.java',
-    'MapsActivity.java',
     'Opener.java',
     'PostActivity.java',
     'QRCodeViewPager.java',
@@ -28,8 +27,6 @@ android_library(
     '//ui/ViewPagerIndicator/src/com/viewpagerindicator:ViewPagerIndicator',
     '//ui/appcompat_v7_4/libs:android-support-v7-appcompat',
     '//ui/Rangzen:experimentalUIRes',
-    '//ui/google-play-services_lib/libs:google-play-services',
-    '//ui/google-play-services_lib:googlePlayServicesRes',
     '//java/org/denovogroup/rangzen:experimentalBackend',
   ],
 )

ui/Rangzen/src/org/denovogroup/rangzen/AboutPage.java

@@ -23,7 +23,6 @@
 import android.os.Message;
 import android.util.Log;
 
-import com.google.android.gms.drive.internal.ac;
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.BinaryBitmap;
 import com.google.zxing.DecodeHintType;
@@ -178,4 +177,4 @@ private void decode(byte[] data) {
 
     }
 
-}
+}