Merge pull request #37 from ParsePlatform/update_facebook_sdk_to_v4

wangmengyan95 · wangmengyan95 · commit 82caece93e59 · 2015-04-15T20:53:21.000-07:00
Update to Facebook SDK V4
diff --git a/ParseLoginSampleBasic/AndroidManifest.xml b/ParseLoginSampleBasic/AndroidManifest.xml
@@ -43,11 +43,18 @@
                 android:name="com.parse.ui.ParseLoginActivity.TWITTER_LOGIN_ENABLED"
                 android:value="true"/>
         </activity>
-        <activity
-            android:name="com.facebook.LoginActivity"
-            android:label="@string/app_name"
-            android:launchMode="singleTop"/>
+        <activity android:name="com.facebook.FacebookActivity"
+                  android:configChanges=
+                      "keyboard|keyboardHidden|screenLayout|screenSize|orientation"
+                  android:theme="@android:style/Theme.Translucent.NoTitleBar"
+                  android:label="@string/app_name" />
 
+        <meta-data
+            android:name="com.parse.APPLICATION_ID"
+            android:value="@string/parse_app_id" />
+        <meta-data
+            android:name="com.parse.CLIENT_KEY"
+            android:value="@string/parse_client_key" />
         <meta-data
             android:name="com.facebook.sdk.ApplicationId"
             android:value="@string/facebook_app_id"/>
diff --git a/ParseLoginSampleBasic/build.gradle b/ParseLoginSampleBasic/build.gradle
@@ -1,11 +1,12 @@
 apply plugin: 'android'
 
 dependencies {
-    compile 'com.facebook.android:facebook-android-sdk:3.23.1'
+    // rootProject.ext.* variables are defined in project gradle file, you can also use path here.
+    compile rootProject.ext.facebookSDK
     compile project(':ParseLoginUI')
-    compile 'com.android.support:support-v4:22.0.0'
-    compile files('../ParseLoginUI/libs/Parse-1.8.4.jar')
-    compile files('../ParseLoginUI/libs/ParseFacebookUtils-1.8.4.jar')
+    compile rootProject.ext.androidSupport
+    compile files(rootProject.ext.parsePath)
+    compile files(rootProject.ext.parseFacebookUtilsPath)
 }
 
 android {
diff --git a/ParseLoginSampleBasic/src/com/parse/loginsample/basic/SampleApplication.java b/ParseLoginSampleBasic/src/com/parse/loginsample/basic/SampleApplication.java
@@ -24,18 +24,20 @@
 import android.app.Application;
 
 import com.parse.Parse;
+import com.parse.ParseFacebookUtils;
 import com.parse.ParseTwitterUtils;
 
 public class SampleApplication extends Application {
   @Override
   public void onCreate() {
     super.onCreate();
     // Required - Initialize the Parse SDK
-    Parse.initialize(this, getString(R.string.parse_app_id),
-        getString(R.string.parse_client_key));
+    Parse.initialize(this);
 
     Parse.setLogLevel(Parse.LOG_LEVEL_DEBUG);
 
+    ParseFacebookUtils.initialize(this);
+
     // Optional - If you don't want to allow Twitter login, you can
     // remove this line (and other related ParseTwitterUtils calls)
     ParseTwitterUtils.initialize(getString(R.string.twitter_consumer_key),
diff --git a/ParseLoginSampleCodeCustomization/AndroidManifest.xml b/ParseLoginSampleCodeCustomization/AndroidManifest.xml
@@ -31,11 +31,18 @@
             android:label="@string/app_name"
             android:launchMode="singleTop">
         </activity>
-        <activity
-            android:name="com.facebook.LoginActivity"
-            android:label="@string/app_name"
-            android:launchMode="singleTop"/>
+        <activity android:name="com.facebook.FacebookActivity"
+                  android:configChanges=
+                      "keyboard|keyboardHidden|screenLayout|screenSize|orientation"
+                  android:theme="@android:style/Theme.Translucent.NoTitleBar"
+                  android:label="@string/app_name" />
 
+        <meta-data
+            android:name="com.parse.APPLICATION_ID"
+            android:value="@string/parse_app_id" />
+        <meta-data
+            android:name="com.parse.CLIENT_KEY"
+            android:value="@string/parse_client_key" />
         <meta-data
             android:name="com.facebook.sdk.ApplicationId"
             android:value="@string/facebook_app_id"/>
diff --git a/ParseLoginSampleCodeCustomization/build.gradle b/ParseLoginSampleCodeCustomization/build.gradle
@@ -1,11 +1,12 @@
 apply plugin: 'android'
 
 dependencies {
-    compile 'com.facebook.android:facebook-android-sdk:3.23.1'
+    // rootProject.ext.* variables are defined in project gradle file, you can also use path here.
+    compile rootProject.ext.facebookSDK
     compile project(':ParseLoginUI')
-    compile 'com.android.support:support-v4:22.0.0'
-    compile files('../ParseLoginUI/libs/Parse-1.8.4.jar')
-    compile files('../ParseLoginUI/libs/ParseFacebookUtils-1.8.4.jar')
+    compile rootProject.ext.androidSupport
+    compile files(rootProject.ext.parsePath)
+    compile files(rootProject.ext.parseFacebookUtilsPath)
 }
 
 android {
diff --git a/ParseLoginSampleCodeCustomization/src/com/parse/loginsample/codecustomization/SampleApplication.java b/ParseLoginSampleCodeCustomization/src/com/parse/loginsample/codecustomization/SampleApplication.java
@@ -24,18 +24,20 @@
 import android.app.Application;
 
 import com.parse.Parse;
+import com.parse.ParseFacebookUtils;
 import com.parse.ParseTwitterUtils;
 
 public class SampleApplication extends Application {
   @Override
   public void onCreate() {
     super.onCreate();
     // Required - Initialize the Parse SDK
-    Parse.initialize(this, getString(R.string.parse_app_id),
-        getString(R.string.parse_client_key));
+    Parse.initialize(this);
 
     Parse.setLogLevel(Parse.LOG_LEVEL_DEBUG);
 
+    ParseFacebookUtils.initialize(this);
+
     // Optional - If you don't want to allow Twitter login, you can
     // remove this line (and other related ParseTwitterUtils calls)
     ParseTwitterUtils.initialize(getString(R.string.twitter_consumer_key),
diff --git a/ParseLoginSampleLayoutOverride/AndroidManifest.xml b/ParseLoginSampleLayoutOverride/AndroidManifest.xml
@@ -43,11 +43,18 @@
                 android:name="com.parse.ui.ParseLoginActivity.TWITTER_LOGIN_ENABLED"
                 android:value="true"/>
         </activity>
-        <activity
-            android:name="com.facebook.LoginActivity"
-            android:label="@string/app_name"
-            android:launchMode="singleTop"/>
+        <activity android:name="com.facebook.FacebookActivity"
+                  android:configChanges=
+                      "keyboard|keyboardHidden|screenLayout|screenSize|orientation"
+                  android:theme="@android:style/Theme.Translucent.NoTitleBar"
+                  android:label="@string/app_name" />
 
+        <meta-data
+            android:name="com.parse.APPLICATION_ID"
+            android:value="@string/parse_app_id" />
+        <meta-data
+            android:name="com.parse.CLIENT_KEY"
+            android:value="@string/parse_client_key" />
         <meta-data
             android:name="com.facebook.sdk.ApplicationId"
             android:value="@string/facebook_app_id"/>
diff --git a/ParseLoginSampleLayoutOverride/build.gradle b/ParseLoginSampleLayoutOverride/build.gradle
@@ -1,11 +1,12 @@
 apply plugin: 'android'
 
 dependencies {
-    compile 'com.facebook.android:facebook-android-sdk:3.23.1'
+    // rootProject.ext.* variables are defined in project gradle file, you can also use path here.
+    compile rootProject.ext.facebookSDK
     compile project(':ParseLoginUI')
-    compile 'com.android.support:support-v4:22.0.0'
-    compile files('../ParseLoginUI/libs/Parse-1.8.4.jar')
-    compile files('../ParseLoginUI/libs/ParseFacebookUtils-1.8.4.jar')
+    compile rootProject.ext.androidSupport
+    compile files(rootProject.ext.parsePath)
+    compile files(rootProject.ext.parseFacebookUtilsPath)
 }
 
 android {
diff --git a/ParseLoginSampleLayoutOverride/src/com/parse/loginsample/layoutoverride/SampleApplication.java b/ParseLoginSampleLayoutOverride/src/com/parse/loginsample/layoutoverride/SampleApplication.java
@@ -24,18 +24,20 @@
 import android.app.Application;
 
 import com.parse.Parse;
+import com.parse.ParseFacebookUtils;
 import com.parse.ParseTwitterUtils;
 
 public class SampleApplication extends Application {
   @Override
   public void onCreate() {
     super.onCreate();
     // Required - Initialize the Parse SDK
-    Parse.initialize(this, getString(R.string.parse_app_id),
-        getString(R.string.parse_client_key));
+    Parse.initialize(this);
 
     Parse.setLogLevel(Parse.LOG_LEVEL_DEBUG);
 
+    ParseFacebookUtils.initialize(this);
+
     // Optional - If you don't want to allow Twitter login, you can
     // remove this line (and other related ParseTwitterUtils calls)
     ParseTwitterUtils.initialize(getString(R.string.twitter_consumer_key),
diff --git a/ParseLoginSampleWithDispatchActivity/AndroidManifest.xml b/ParseLoginSampleWithDispatchActivity/AndroidManifest.xml
@@ -47,11 +47,18 @@
                 android:name="com.parse.ui.ParseLoginActivity.TWITTER_LOGIN_ENABLED"
                 android:value="true"/>
         </activity>
-        <activity
-            android:name="com.facebook.LoginActivity"
-            android:label="@string/app_name"
-            android:launchMode="singleTop"/>
+        <activity android:name="com.facebook.FacebookActivity"
+                  android:configChanges=
+                      "keyboard|keyboardHidden|screenLayout|screenSize|orientation"
+                  android:theme="@android:style/Theme.Translucent.NoTitleBar"
+                  android:label="@string/app_name" />
 
+        <meta-data
+            android:name="com.parse.APPLICATION_ID"
+            android:value="@string/parse_app_id" />
+        <meta-data
+            android:name="com.parse.CLIENT_KEY"
+            android:value="@string/parse_client_key" />
         <meta-data
             android:name="com.facebook.sdk.ApplicationId"
             android:value="@string/facebook_app_id"/>
diff --git a/ParseLoginSampleWithDispatchActivity/build.gradle b/ParseLoginSampleWithDispatchActivity/build.gradle
@@ -1,11 +1,12 @@
 apply plugin: 'android'
 
 dependencies {
-    compile 'com.facebook.android:facebook-android-sdk:3.23.1'
+    // rootProject.ext.* variables are defined in project gradle file, you can also use path here.
+    compile rootProject.ext.facebookSDK
     compile project(':ParseLoginUI')
-    compile 'com.android.support:support-v4:22.0.0'
-    compile files('../ParseLoginUI/libs/Parse-1.8.4.jar')
-    compile files('../ParseLoginUI/libs/ParseFacebookUtils-1.8.4.jar')
+    compile rootProject.ext.androidSupport
+    compile files(rootProject.ext.parsePath)
+    compile files(rootProject.ext.parseFacebookUtilsPath)
 }
 
 android {
diff --git a/ParseLoginSampleWithDispatchActivity/src/com/parse/loginsample/withdispatchactivity/SampleApplication.java b/ParseLoginSampleWithDispatchActivity/src/com/parse/loginsample/withdispatchactivity/SampleApplication.java
@@ -24,18 +24,20 @@
 import android.app.Application;
 
 import com.parse.Parse;
+import com.parse.ParseFacebookUtils;
 import com.parse.ParseTwitterUtils;
 
 public class SampleApplication extends Application {
   @Override
   public void onCreate() {
     super.onCreate();
     // Required - Initialize the Parse SDK
-    Parse.initialize(this, getString(R.string.parse_app_id),
-        getString(R.string.parse_client_key));
+    Parse.initialize(this);
 
     Parse.setLogLevel(Parse.LOG_LEVEL_DEBUG);
 
+    ParseFacebookUtils.initialize(this);
+
     // Optional - If you don't want to allow Twitter login, you can
     // remove this line (and other related ParseTwitterUtils calls)
     ParseTwitterUtils.initialize(getString(R.string.twitter_consumer_key),
diff --git a/ParseLoginUI/build.gradle b/ParseLoginUI/build.gradle
@@ -1,21 +1,20 @@
 apply plugin: 'android-library'
 
 dependencies {
-    compile 'com.parse.bolts:bolts-android:1.1.4'
+    compile 'com.parse.bolts:bolts-android:1.2.0'
     compile 'com.android.support:support-v4:22.0.0'
 
-    provided 'com.facebook.android:facebook-android-sdk:3.23.1'
-
+    provided 'com.facebook.android:facebook-android-sdk:4.0.1'
     // This assumes that your app's project has a compile dependency on the Parse SDK JAR files.
     // Your project's build.gradle should say:
     //
-    //     compile files('YOUR_PROJECT_LIBS_PATH/Parse-1.8.4.jar')
-    //     compile files('YOUR_PROJECT_LIBS_PATH/ParseFacebookUtils-1.8.4.jar')
+    //     compile files('YOUR_PROJECT_LIBS_PATH/Parse-1.9.1.jar')
+    //     compile files('YOUR_PROJECT_LIBS_PATH/ParseFacebookUtilsV4-1.9.1.jar')
     //
     // Since the dependency below is "provided" instead of "compile", your project's build.gradle
     // does not have to refer to the same Parse SDK instance that's in the ParseLoginUI/libs folder.
-    provided files('libs/Parse-1.8.4.jar')
-    provided files('libs/ParseFacebookUtils-1.8.4.jar')
+    provided files("$rootProject.projectDir/ParseLoginUI/libs/Parse-1.9.1.jar")
+    provided files("$rootProject.projectDir/ParseLoginUI/libs/ParseFacebookUtilsV4-1.9.1.jar")
 }
 
 android {
diff --git a/ParseLoginUI/libs/Parse-1.9.1.jar b/ParseLoginUI/libs/Parse-1.9.1.jar
diff --git a/ParseLoginUI/libs/ParseFacebookUtils-1.8.4.jar b/ParseLoginUI/libs/ParseFacebookUtils-1.8.4.jar
diff --git a/ParseLoginUI/libs/ParseFacebookUtilsV4-1.9.1.jar b/ParseLoginUI/libs/ParseFacebookUtilsV4-1.9.1.jar
diff --git a/ParseLoginUI/src/com/parse/ui/ParseLoginActivity.java b/ParseLoginUI/src/com/parse/ui/ParseLoginActivity.java
@@ -113,9 +113,9 @@ protected void onDestroy() {
   @Override
   public void onActivityResult(int requestCode, int resultCode, Intent data) {
     super.onActivityResult(requestCode, resultCode, data);
-
+    
     // Required for making Facebook login work
-    ParseFacebookUtils.finishAuthentication(requestCode, resultCode, data);
+    ParseFacebookUtils.onActivityResult(requestCode, resultCode, data);
   }
 
   /**
diff --git a/ParseLoginUI/src/com/parse/ui/ParseLoginConfig.java b/ParseLoginUI/src/com/parse/ui/ParseLoginConfig.java
@@ -195,6 +195,15 @@ public void setFacebookLoginPermissions(Collection<String> permissions) {
     }
   }
 
+  /* package */ boolean isFacebookLoginNeedPublishPermissions() {
+    if (facebookLoginPermissions != null) {
+      return facebookLoginPermissions.contains("publish_actions") ||
+          facebookLoginPermissions.contains("publish_pages");
+    } else {
+      return false;
+    }
+  }
+
   public boolean isTwitterLoginEnabled() {
     if (twitterLoginEnabled != null) {
       return twitterLoginEnabled;
diff --git a/ParseLoginUI/src/com/parse/ui/ParseLoginFragment.java b/ParseLoginUI/src/com/parse/ui/ParseLoginFragment.java
diff --git a/README.md b/README.md
diff --git a/build.gradle b/build.gradle
diff --git a/settings.gradle b/settings.gradle
