Merge pull request #3 from defold/fbsdk5

Update to Facebook SDK 5.0 and Graph API 3.3

Author: mathiaswking

.gitignore

@@ -9,3 +9,6 @@ Thumbs.db
 .cproject
 builtins
 *.pem
+.gradle
+_site
+Gemfile.lock

facebook/ext.manifest

@@ -3,7 +3,7 @@ name: FacebookExtExternal
 platforms:
     android:
         bundle:
-            aaptExtraPackages: ['com.facebook']
+            aaptExtraPackages: ['com.facebook', 'com.facebook.common']
 
     ios:
         context:

facebook/lib/android/bolts-android-1.2.0.jar

@@ -136,65 +136,6 @@ var LibraryFacebook = {
             console.error("Limiting Facebook Analytics is not supported for Canvas");
         },
 
-        // https://developers.facebook.com/docs/reference/javascript/FB.login/v2.0
-        dmFacebookDoLogin: function(state_open, state_closed, state_failed, callback, lua_state) {
-
-            var chainedUpdateMeAndPermissions = function() {
-                // request user and permissions data, need to store this on the C side
-                window._dmFacebookUpdateMe(function(e, me_data) {
-                    if (e == 0) {
-                        window._dmFacebookUpdatePermissions(function(e, permissions_data) {
-                            if (e == 0) {
-                                var me_buf = allocate(intArrayFromString(me_data), 'i8', ALLOC_STACK);
-                                var permissions_buf = allocate(intArrayFromString(permissions_data), 'i8', ALLOC_STACK);
-                                Runtime.dynCall('viiiii', callback, [lua_state, state_open, 0, me_buf, permissions_buf]);
-                            } else {
-                                var err_buf = allocate(intArrayFromString(e), 'i8', ALLOC_STACK);
-                                Runtime.dynCall('viiiii', callback, [lua_state, state_failed, err_buf, 0, 0]);
-                            }
-                        });
-                    } else {
-                        var err_buf = allocate(intArrayFromString(e), 'i8', ALLOC_STACK);
-                        Runtime.dynCall('viiiii', callback, [lua_state, state_failed, err_buf, 0, 0]);
-                    }
-                });
-            }
-
-            try {
-
-                FB.getLoginStatus(function(response) {
-
-                    // The user might login with JS outside Defold,
-                    // then we only need to update the me-table and
-                    // permissions list.
-                    if (response.status === 'connected') {
-                        chainedUpdateMeAndPermissions();
-                    } else {
-
-                        FB.login(function(response) {
-                            var e = (response && response.error ? response.error.message : 0);
-                            if (e == 0 && response.authResponse) {
-
-                                chainedUpdateMeAndPermissions();
-
-                            } else if (e != 0) {
-                                var err_buf = allocate(intArrayFromString(e), 'i8', ALLOC_STACK);
-                                Runtime.dynCall('viiiii', callback, [lua_state, state_closed, err_buf, 0, 0]);
-                            } else {
-                                // No authResponse. Below text is from facebook's own example of this case.
-                                e = 'User cancelled login or did not fully authorize.';
-                                var err_buf = allocate(intArrayFromString(e), 'i8', ALLOC_STACK);
-                                Runtime.dynCall('viiiii', callback, [lua_state, state_failed, err_buf, 0, 0]);
-                            }
-                        }, {scope: 'public_profile,user_friends'});
-
-                    }
-                });
-            } catch (e) {
-                console.error("Facebook login failed " + e);
-            }
-        },
-
         dmFacebookDoLogout: function() {
             try {
                 FB.logout(function(response) {
@@ -234,7 +175,7 @@ var LibraryFacebook = {
             }
         },
 
-        // https://developers.facebook.com/docs/reference/javascript/FB.login/v2.0
+        // https://developers.facebook.com/docs/reference/javascript/FB.login/v3.3
         // https://developers.facebook.com/docs/facebook-login/permissions/v2.0
         dmFacebookRequestReadPermissions: function(permissions, callback, lua_state) {
             try {
@@ -269,7 +210,7 @@ var LibraryFacebook = {
 
         },
 
-        // https://developers.facebook.com/docs/reference/javascript/FB.login/v2.0
+        // https://developers.facebook.com/docs/reference/javascript/FB.login/v3.3
         // https://developers.facebook.com/docs/facebook-login/permissions/v2.0
         dmFacebookRequestPublishPermissions: function(permissions, audience, callback, lua_state) {
             try {

facebook/lib/android/facebooksdk-5.0.0.jar

@@ -0,0 +1,41 @@
+# Building libraries for Android
+
+## Build the .jar file
+
+* Call `gradle build` with only the Android dependencies (see [build.gradle](build.gradle))
+
+* Copy the jar file to `android-support.jar`
+
+* Call `gradle build` with the Facebook dependencies (see [build.gradle](build.gradle))
+
+## Repack the .jar file
+
+* Create a text file containing the class files from `android-support.jar`
+
+		$ jar tvf android-support.jar > support.txt
+
+* Repack the facebook jar file with
+
+		$ python repack.py ../build/package/share/java/facebooksdk-5.0.0.jar support.txt facebooksdk-5.0.0.jar
+
+* Copy the `facebooksdk-5.0.0.jar` to `facebook/lib/android/facebooksdk-5.0.0.jar`
+
+## Copy the resources
+
+* Unpack the facebook package `facebooksdk-5.0.0.tar.gz` (generated when building the jar file)
+
+		$ mkdir foo
+		$ cd foo
+		$ tar xf ../facebooksdk-5.0.0.tar.gz
+
+* Make sure the share/java/<dependency>/res/ files doesn't collide with any in the `android.jar` from the engine
+
+	* `http://d.defold.com/archive/<SHA1>/engine/armv7-android/android.jar`
+
+* Copy the resources to the extension
+
+		$ python copy_resources.py foo/share/java/res/ ../../res/android/res
+
+## Done!
+
+

facebook/lib/android/facebooksdk.jar

@@ -0,0 +1,141 @@
+apply plugin: 'java'
+
+repositories {
+    maven {
+        url "https://maven.google.com/"
+    }
+    mavenCentral()
+}
+
+def fbVersion = "5.0.0"
+
+// * Build once with these support dependencies only
+// * Then run: jar tvf ./build/package/share/java/facebooksdk-5.0.0.jar > support.txt
+// * Then revert the support dependencies in favor of the actual fb dependencies
+// dependencies {
+//     compile "com.android.support:support-v4:27.1.1"
+//     compile "com.android.support:support-compat:27.1.1"
+//     compile "com.android.support:support-core-utils:27.1.1"
+//     compile "com.android.support:support-core-ui:27.1.1"
+//     compile "com.android.support:support-media-compat:27.1.1"
+//     compile "com.android.support:support-fragment:27.1.1"
+//     compile "com.android.support:support-annotations:27.1.1"
+// }
+
+dependencies {
+
+    // Facebook Core only (Analytics)
+    compile "com.facebook.android:facebook-core:${fbVersion}"
+
+    // Facebook Login only
+    compile "com.facebook.android:facebook-login:${fbVersion}"
+
+    // Facebook Share only
+    compile "com.facebook.android:facebook-share:${fbVersion}"
+
+    // // Facebook Places only
+    // compile "com.facebook.android:facebook-places:${fbVersion}"
+
+    // // Facebook Messenger only
+    // compile "com.facebook.android:facebook-messenger:${fbVersion}"
+
+    // // Facebook App Links only
+    // compile "com.facebook.android:facebook-applinks:${fbVersion}"
+
+    // Facebook Android SDK (everything)
+    compile "com.facebook.android:facebook-android-sdk:${fbVersion}"
+}
+
+def outputPackageName = "facebooksdk-${fbVersion}"
+def resultDirectory = "${project.buildDir}/result"
+def packedDirectory = "${resultDirectory}/packed"
+def aarDirectory = "${packedDirectory}/aar"
+def unpackedDirectory = "${resultDirectory}/unpacked"
+def unpackedClassesDirectory = "${unpackedDirectory}/classes"
+def packageOutputDirectory = "${project.buildDir}/package"
+def packageDirectory = "${packageOutputDirectory}/share/java"
+def packageResDirectory = "${packageDirectory}/res"
+
+task copyArtifacts() {
+    outputs.dir packedDirectory
+
+    project.configurations.runtime.resolvedConfiguration.resolvedArtifacts.each { artifact ->
+        println "${artifact.moduleVersion.id.group}.${artifact.name}-${artifact.moduleVersion.id.version}.${artifact.extension}"
+        copy {
+            from artifact.file
+            into packedDirectory
+            rename "(.*)", "${artifact.moduleVersion.id.group}.${artifact.name}-${artifact.moduleVersion.id.version}.${artifact.extension}"
+        }
+    }
+}
+
+task unzipJars(dependsOn: copyArtifacts) {
+    inputs.dir packedDirectory
+    outputs.dir unpackedClassesDirectory
+
+    doLast {
+        println('*** Unzip jars')
+        fileTree(dir: packedDirectory).include('*.jar').each { lib ->
+            copy {
+                println "Unzip $lib.name"
+                from zipTree(lib)
+                into unpackedClassesDirectory
+                exclude 'META-INF/'
+                exclude 'NOTICE.txt'
+            }
+        }
+    }
+}
+
+task unzipAars(dependsOn: unzipJars) {
+    inputs.dir packedDirectory
+    outputs.dir unpackedClassesDirectory
+
+    doLast {
+        println('*** Unzip aars')
+        fileTree(dir: packedDirectory).include('*.aar').each { lib ->
+            copy {
+                println "Unzip $lib.name"
+                def dirName = lib.name - '.aar'
+                from zipTree(lib)
+                into "${aarDirectory}/${dirName}"
+            }
+        }
+        println('*** Unzip jars from aars')
+        fileTree(dir: "${aarDirectory}").include('**/*.jar').each { lib ->
+            copy {
+                println "Unzip $lib.name"
+                from zipTree(lib)
+                into unpackedClassesDirectory
+                exclude 'META-INF/'
+            }
+        }
+    }
+}
+
+task zipClasses(dependsOn: unzipAars, type: Zip) {
+    from unpackedClassesDirectory
+    archiveName "${outputPackageName}.jar"
+    destinationDir file("${packageDirectory}")
+}
+
+task collectResources(dependsOn: zipClasses, type:Exec) {
+    commandLine 'python', 'extract_res.py', "${aarDirectory}", "${packageResDirectory}"
+}
+
+task fixResPermissions(dependsOn: collectResources, type:Exec) {
+    commandLine "chmod", "-R", "+rw", "${packageResDirectory}"
+}
+
+task createPackage(dependsOn: fixResPermissions, type: Tar) {
+    from packageOutputDirectory
+    archiveName "${outputPackageName}.tar.gz"
+    compression = Compression.GZIP
+    destinationDir file("./")
+}
+
+build.dependsOn createPackage
+
+clean {
+    delete "${project.buildDir}"
+}

facebook/lib/web/library_facebook.js

@@ -0,0 +1,38 @@
+import os
+import sys
+import shutil
+
+def copytree(src, dst):
+    """ https://stackoverflow.com/a/13814557/468516 """
+    if not os.path.exists(dst):
+        os.makedirs(dst)
+    for item in os.listdir(src):
+        s = os.path.join(src, item)
+        d = os.path.join(dst, item)
+        if os.path.isdir(s):
+            copytree(s, d)
+        else:
+            if not os.path.exists(d) or os.stat(s).st_mtime - os.stat(d).st_mtime > 1:
+                shutil.copy2(s, d)
+
+def extract_res(package_name, dir, output_dir):
+    res_path = os.path.join(dir, "res")
+    if os.path.exists(res_path):
+        if os.listdir(res_path):
+            print("Copying " + package_name)
+            output_package_dir = os.path.join(output_dir, package_name)
+            copytree(res_path, output_package_dir)
+
+
+def iterate_and_extract(dir, output_dir):
+    for package_name in os.listdir(dir):
+        path = os.path.join(dir, package_name)
+        if os.path.isdir(path):
+            extract_res(package_name, path, output_dir)
+
+# python extract_res.py build/result/packed/aar /output_directory/
+def main():
+    iterate_and_extract(sys.argv[1], sys.argv[2])
+
+if __name__ == "__main__":
+    main()

facebook/libhelper/android/README.md

@@ -0,0 +1,50 @@
+#!/usr/bin/env python
+import os, sys, shutil, subprocess
+
+def run(cmd, cwd=None):
+	print "CMD", cmd
+	print "CWD", cwd
+	p = subprocess.Popen(cmd.split(), cwd=cwd)
+	p.wait()
+
+def unpack_jar(path, outputdir):
+	run('jar xf %s' % path, outputdir)
+
+def pack_jar(path, outputjar):
+	run('jar cf %s .' % outputjar, path)
+
+def read_excludes(path):
+	excludes = []
+	with open(path, 'rb') as f:
+		for line in f.readlines():
+			line = line.strip()
+			if not line.endswith('.class'):
+				continue
+			excludes.append(line)
+	return excludes
+
+def prune_files(dir, excludes):
+	for root, dirs, files in os.walk(dir):
+		for f in files:
+			full = os.path.join(root, f)
+			relative = os.path.relpath(full, dir)
+			if relative in excludes:
+				print relative, "\t\tEXCLUDED"
+				os.unlink(full)
+
+
+if __name__ == '__main__':
+	injar = os.path.abspath(sys.argv[1])
+	excludesfile = os.path.abspath(sys.argv[2])
+	outputjar = os.path.abspath(sys.argv[3])
+	tmpdir = os.path.abspath('_tmp')
+	print "Created temp dir", tmpdir
+	if not os.path.exists(tmpdir):
+		os.makedirs(tmpdir)
+	unpack_jar(injar, tmpdir)
+	excludes = read_excludes(excludesfile)
+	prune_files(tmpdir, excludes)
+	pack_jar(tmpdir, outputjar)
+
+	shutil.rmtree(tmpdir)
+	print "Removed temp dir", tmpdir