Skip to content

Instantly share code, notes, and snippets.

@nodrock

nodrock/patch.diff

Created June 29, 2015 09:29
Show Gist options
  • Save nodrock/40ee14fd20cbed3d451c to your computer and use it in GitHub Desktop.
Save nodrock/40ee14fd20cbed3d451c to your computer and use it in GitHub Desktop.
Download ZIP
ANE-Facebook patch to Java 1.6
Raw
patch.diff
diff --git a/android/build.gradle b/android/build.gradle
index 88b5a00..d170937 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -34,8 +34,8 @@ android {
}
compileOptions {
- sourceCompatibility JavaVersion.VERSION_1_7
- targetCompatibility JavaVersion.VERSION_1_7
+ sourceCompatibility JavaVersion.VERSION_1_6
+ targetCompatibility JavaVersion.VERSION_1_6
}
}
diff --git a/android/src/com/facebook/AccessToken.java b/android/src/com/facebook/AccessToken.java
index 668be1a..109c91a 100644
--- a/android/src/com/facebook/AccessToken.java
+++ b/android/src/com/facebook/AccessToken.java
@@ -556,7 +556,7 @@ public final class AccessToken implements Parcelable {
AccessToken(Parcel parcel) {
this.expires = new Date(parcel.readLong());
- ArrayList<String> permissionsList = new ArrayList<>();
+ ArrayList<String> permissionsList = new ArrayList<String>();
parcel.readStringList(permissionsList);
this.permissions = Collections.unmodifiableSet(new HashSet<String>(permissionsList));
permissionsList.clear();
diff --git a/android/src/com/facebook/AccessTokenManager.java b/android/src/com/facebook/AccessTokenManager.java
index 82ee601..c989fee 100644
--- a/android/src/com/facebook/AccessTokenManager.java
+++ b/android/src/com/facebook/AccessTokenManager.java
@@ -221,8 +221,8 @@ final class AccessTokenManager {
lastAttemptedTokenExtendDate = new Date();
- final Set<String> permissions = new HashSet<>();
- final Set<String> declinedPermissions = new HashSet<>();
+ final Set<String> permissions = new HashSet<String>();
+ final Set<String> declinedPermissions = new HashSet<String>();
final AtomicBoolean permissionsCallSucceeded = new AtomicBoolean(false);
final RefreshResult refreshResult = new RefreshResult();
diff --git a/android/src/com/facebook/internal/CallbackManagerImpl.java b/android/src/com/facebook/internal/CallbackManagerImpl.java
index bc88153..9069c70 100644
--- a/android/src/com/facebook/internal/CallbackManagerImpl.java
+++ b/android/src/com/facebook/internal/CallbackManagerImpl.java
@@ -34,7 +34,7 @@ import java.util.Map;
* unsupported, and they may be modified or removed without warning at any time.
*/
public final class CallbackManagerImpl implements CallbackManager {
- private static Map<Integer, Callback> staticCallbacks = new HashMap<>();
+ private static Map<Integer, Callback> staticCallbacks = new HashMap<Integer, Callback>();
/**
* If there is no explicit callback, but we still need to call the Facebook component,
@@ -68,7 +68,7 @@ public final class CallbackManagerImpl implements CallbackManager {
return false;
}
- private Map<Integer, Callback> callbacks = new HashMap<>();
+ private Map<Integer, Callback> callbacks = new HashMap<Integer, Callback>();
public void registerCallback(int requestCode, Callback callback) {
Validate.notNull(callback, "callback");
diff --git a/android/src/com/facebook/internal/CollectionMapper.java b/android/src/com/facebook/internal/CollectionMapper.java
index 6ab0f11..0e3f5b3 100644
--- a/android/src/com/facebook/internal/CollectionMapper.java
+++ b/android/src/com/facebook/internal/CollectionMapper.java
@@ -60,7 +60,7 @@ public class CollectionMapper {
};
Iterator<T> keyIterator = collection.keyIterator();
- List<T> keys = new LinkedList<>();
+ List<T> keys = new LinkedList<T>();
while (keyIterator.hasNext()) {
keys.add(keyIterator.next());
}
diff --git a/android/src/com/facebook/internal/FacebookRequestErrorClassification.java b/android/src/com/facebook/internal/FacebookRequestErrorClassification.java
index 770af2c..4bba22f 100644
--- a/android/src/com/facebook/internal/FacebookRequestErrorClassification.java
+++ b/android/src/com/facebook/internal/FacebookRequestErrorClassification.java
@@ -166,7 +166,7 @@ public final class FacebookRequestErrorClassification {
return null;
}
- Map<Integer, Set<Integer>> items = new HashMap<>();
+ Map<Integer, Set<Integer>> items = new HashMap<Integer, Set<Integer>>();
for (int i = 0; i < itemsArray.length(); i++) {
JSONObject item = itemsArray.optJSONObject(i);
if (item == null) {
@@ -179,7 +179,7 @@ public final class FacebookRequestErrorClassification {
Set<Integer> subcodes = null;
JSONArray subcodesArray = item.optJSONArray("subcodes");
if (subcodesArray != null && subcodesArray.length() > 0) {
- subcodes = new HashSet<>();
+ subcodes = new HashSet<Integer>();
for (int j = 0; j < subcodesArray.length(); j++) {
int subCode = subcodesArray.optInt(j);
if (subCode != 0) {
diff --git a/android/src/com/facebook/internal/NativeAppCallAttachmentStore.java b/android/src/com/facebook/internal/NativeAppCallAttachmentStore.java
index 18814f3..da646ba 100644
--- a/android/src/com/facebook/internal/NativeAppCallAttachmentStore.java
+++ b/android/src/com/facebook/internal/NativeAppCallAttachmentStore.java
@@ -109,7 +109,7 @@ public final class NativeAppCallAttachmentStore {
ensureAttachmentsDirectoryExists();
- List<File> filesToCleanup = new ArrayList<>();
+ List<File> filesToCleanup = new ArrayList<File>();
try {
for (Attachment attachment : attachments) {
diff --git a/android/src/com/facebook/internal/NativeProtocol.java b/android/src/com/facebook/internal/NativeProtocol.java
index f6aa304..50e42a7 100644
--- a/android/src/com/facebook/internal/NativeProtocol.java
+++ b/android/src/com/facebook/internal/NativeProtocol.java
@@ -769,7 +769,7 @@ public final class NativeProtocol {
private static TreeSet<Integer> fetchAllAvailableProtocolVersionsForAppInfo(
NativeAppInfo appInfo) {
- TreeSet<Integer> allAvailableVersions = new TreeSet<>();
+ TreeSet<Integer> allAvailableVersions = new TreeSet<Integer>();
Context appContext = FacebookSdk.getApplicationContext();
ContentResolver contentResolver = appContext.getContentResolver();
diff --git a/android/src/com/facebook/internal/ProfileInformationCache.java b/android/src/com/facebook/internal/ProfileInformationCache.java
index dcfe025..5dde5d0 100644
--- a/android/src/com/facebook/internal/ProfileInformationCache.java
+++ b/android/src/com/facebook/internal/ProfileInformationCache.java
@@ -34,7 +34,7 @@ import java.util.concurrent.ConcurrentHashMap;
*/
class ProfileInformationCache {
final private static ConcurrentHashMap<String, JSONObject> infoCache =
- new ConcurrentHashMap<>();
+ new ConcurrentHashMap<String, JSONObject>();
public static JSONObject getProfileInformation(String accessToken) {
return infoCache.get(accessToken);
diff --git a/android/src/com/facebook/internal/Utility.java b/android/src/com/facebook/internal/Utility.java
index 3cdc319..eaa90c0 100644
--- a/android/src/com/facebook/internal/Utility.java
+++ b/android/src/com/facebook/internal/Utility.java
@@ -523,19 +523,19 @@ public final class Utility {
if (value == null) {
bundle.remove(key);
} else if (value instanceof Boolean) {
- bundle.putBoolean(key, (boolean) value);
+ bundle.putBoolean(key, (Boolean) value);
} else if (value instanceof boolean[]) {
bundle.putBooleanArray(key, (boolean[]) value);
} else if (value instanceof Double) {
- bundle.putDouble(key, (double) value);
+ bundle.putDouble(key, (Double) value);
} else if (value instanceof double[]) {
bundle.putDoubleArray(key, (double[]) value);
} else if (value instanceof Integer) {
- bundle.putInt(key, (int) value);
+ bundle.putInt(key, (Integer) value);
} else if (value instanceof int[]) {
bundle.putIntArray(key, (int[]) value);
} else if (value instanceof Long) {
- bundle.putLong(key, (long) value);
+ bundle.putLong(key, (Long) value);
} else if (value instanceof long[]) {
bundle.putLongArray(key, (long[]) value);
} else if (value instanceof String) {
@@ -958,7 +958,7 @@ public final class Utility {
}
public static List<String> jsonArrayToStringList(JSONArray jsonArray) throws JSONException {
- ArrayList<String> result = new ArrayList<>();
+ ArrayList<String> result = new ArrayList<String>();
for (int i = 0; i < jsonArray.length(); i++) {
result.add(jsonArray.getString(i));
@@ -968,7 +968,7 @@ public final class Utility {
}
public static Set<String> jsonArrayToSet(JSONArray jsonArray) throws JSONException {
- Set<String> result = new HashSet<>();
+ Set<String> result = new HashSet<String>();
for (int i = 0; i < jsonArray.length(); i++) {
result.add(jsonArray.getString(i));
}
@@ -1235,7 +1235,7 @@ public final class Utility {
if (size < 0) {
return null;
}
- Map<String, String> map = new HashMap<>();
+ Map<String, String> map = new HashMap<String, String>();
for (int i = 0; i < size; i++) {
map.put(parcel.readString(), parcel.readString());
}
diff --git a/android/src/com/facebook/login/LoginClient.java b/android/src/com/facebook/login/LoginClient.java
index a4ced69..4461538 100644
--- a/android/src/com/facebook/login/LoginClient.java
+++ b/android/src/com/facebook/login/LoginClient.java
@@ -490,7 +490,7 @@ class LoginClient implements Parcelable {
private Request(Parcel parcel) {
String enumValue = parcel.readString();
this.loginBehavior = enumValue != null ? LoginBehavior.valueOf(enumValue) : null;
- ArrayList<String> permissionsList = new ArrayList<>();
+ ArrayList<String> permissionsList = new ArrayList<String>();
parcel.readStringList(permissionsList);
this.permissions = new HashSet<String>(permissionsList);
enumValue = parcel.readString();
diff --git a/android/src/com/facebook/login/LoginManager.java b/android/src/com/facebook/login/LoginManager.java
index 5c71a6c..f9c6642 100644
--- a/android/src/com/facebook/login/LoginManager.java
+++ b/android/src/com/facebook/login/LoginManager.java
@@ -354,7 +354,7 @@ public class LoginManager {
) throws FacebookException {
this.pendingLoginRequest = request;
- this.pendingLoggingExtras = new HashMap<>();
+ this.pendingLoggingExtras = new HashMap<String, String>();
this.context = startActivityDelegate.getActivityContext();
logStartLogin();
diff --git a/android/src/com/facebook/share/internal/LegacyNativeDialogParameters.java b/android/src/com/facebook/share/internal/LegacyNativeDialogParameters.java
index a00f9e5..3c64565 100644
--- a/android/src/com/facebook/share/internal/LegacyNativeDialogParameters.java
+++ b/android/src/com/facebook/share/internal/LegacyNativeDialogParameters.java
@@ -103,7 +103,7 @@ public class LegacyNativeDialogParameters {
boolean dataErrorsFatal) {
Bundle params = createBaseParameters(photoContent, dataErrorsFatal);
- params.putStringArrayList(ShareConstants.LEGACY_PHOTOS, new ArrayList<>(imageUrls));
+ params.putStringArrayList(ShareConstants.LEGACY_PHOTOS, new ArrayList<String>(imageUrls));
return params;
}
@@ -149,7 +149,7 @@ public class LegacyNativeDialogParameters {
if (!Utility.isNullOrEmpty(peopleIds)) {
params.putStringArrayList(
ShareConstants.LEGACY_FRIEND_TAGS,
- new ArrayList<>(peopleIds));
+ new ArrayList<String>(peopleIds));
}
return params;
diff --git a/android/src/com/facebook/share/internal/LikeActionController.java b/android/src/com/facebook/share/internal/LikeActionController.java
index 8f21b82..49ebb33 100644
--- a/android/src/com/facebook/share/internal/LikeActionController.java
+++ b/android/src/com/facebook/share/internal/LikeActionController.java
@@ -114,7 +114,7 @@ public class LikeActionController {
private static FileLruCache controllerDiskCache;
private static final ConcurrentHashMap<String, LikeActionController> cache =
- new ConcurrentHashMap<>();
+ new ConcurrentHashMap<String, LikeActionController>();
// This MUST be 1 for proper synchronization
private static WorkQueue mruCacheWorkQueue = new WorkQueue(1);
diff --git a/android/src/com/facebook/share/internal/LikeDialog.java b/android/src/com/facebook/share/internal/LikeDialog.java
index 774dd65..e6161db 100644
--- a/android/src/com/facebook/share/internal/LikeDialog.java
+++ b/android/src/com/facebook/share/internal/LikeDialog.java
@@ -78,7 +78,7 @@ public class LikeDialog extends FacebookDialogBase<LikeContent, LikeDialog.Resul
@Override
protected List<ModeHandler> getOrderedModeHandlers() {
- ArrayList<ModeHandler> handlers = new ArrayList<>();
+ ArrayList<ModeHandler> handlers = new ArrayList<ModeHandler>();
handlers.add(new NativeHandler());
handlers.add(new WebFallbackHandler());
diff --git a/android/src/com/facebook/share/internal/NativeDialogParameters.java b/android/src/com/facebook/share/internal/NativeDialogParameters.java
index 40443c9..8172e13 100644
--- a/android/src/com/facebook/share/internal/NativeDialogParameters.java
+++ b/android/src/com/facebook/share/internal/NativeDialogParameters.java
@@ -106,7 +106,7 @@ public class NativeDialogParameters {
boolean dataErrorsFatal) {
Bundle params = createBaseParameters(photoContent, dataErrorsFatal);
- params.putStringArrayList(ShareConstants.PHOTOS, new ArrayList<>(imageUrls));
+ params.putStringArrayList(ShareConstants.PHOTOS, new ArrayList<String>(imageUrls));
return params;
}
diff --git a/android/src/com/facebook/share/internal/ShareInternalUtility.java b/android/src/com/facebook/share/internal/ShareInternalUtility.java
index 4ff0553..f37b5e1 100644
--- a/android/src/com/facebook/share/internal/ShareInternalUtility.java
+++ b/android/src/com/facebook/share/internal/ShareInternalUtility.java
@@ -323,7 +323,7 @@ public final class ShareInternalUtility {
appCallId,
videoContent.getVideo().getLocalUrl());
- ArrayList<NativeAppCallAttachmentStore.Attachment> attachments = new ArrayList<>(1);
+ ArrayList<NativeAppCallAttachmentStore.Attachment> attachments = new ArrayList<NativeAppCallAttachmentStore.Attachment>(1);
attachments.add(attachment);
NativeAppCallAttachmentStore.addAttachments(attachments);
@@ -335,7 +335,7 @@ public final class ShareInternalUtility {
final ShareOpenGraphContent content)
throws JSONException {
final ShareOpenGraphAction action = content.getAction();
- final ArrayList<NativeAppCallAttachmentStore.Attachment> attachments = new ArrayList<>();
+ final ArrayList<NativeAppCallAttachmentStore.Attachment> attachments = new ArrayList<NativeAppCallAttachmentStore.Attachment>();
JSONObject actionJSON = OpenGraphJSONUtility.toJSONObject(
action,
new OpenGraphJSONUtility.PhotoJSONProcessor() {
@@ -386,7 +386,7 @@ public final class ShareInternalUtility {
for (String peopleId : content.getPeopleIds()) {
peopleIdSet.add(peopleId);
}
- actionJSON.put("tags", new ArrayList<>(peopleIdSet));
+ actionJSON.put("tags", new ArrayList<String>(peopleIdSet));
}
return actionJSON;
@@ -493,7 +493,7 @@ public final class ShareInternalUtility {
} else {
fieldName = fullName;
}
- return new Pair<>(namespace, fieldName);
+ return new Pair<String, String>(namespace, fieldName);
}
;
@@ -960,7 +960,7 @@ public final class ShareInternalUtility {
ParcelFileDescriptor descriptor =
ParcelFileDescriptor.open(file, ParcelFileDescriptor.MODE_READ_ONLY);
GraphRequest.ParcelableResourceWithMimeType<ParcelFileDescriptor> resourceWithMimeType =
- new GraphRequest.ParcelableResourceWithMimeType<>(descriptor, "image/png");
+ new GraphRequest.ParcelableResourceWithMimeType<ParcelFileDescriptor>(descriptor, "image/png");
Bundle parameters = new Bundle(1);
parameters.putParcelable(STAGING_PARAM, resourceWithMimeType);
@@ -1000,7 +1000,7 @@ public final class ShareInternalUtility {
}
GraphRequest.ParcelableResourceWithMimeType<Uri> resourceWithMimeType =
- new GraphRequest.ParcelableResourceWithMimeType<>(imageUri, "image/png");
+ new GraphRequest.ParcelableResourceWithMimeType<Uri>(imageUri, "image/png");
Bundle parameters = new Bundle(1);
parameters.putParcelable(STAGING_PARAM, resourceWithMimeType);
diff --git a/android/src/com/facebook/share/internal/VideoUploader.java b/android/src/com/facebook/share/internal/VideoUploader.java
index fc7c0ba..f02c9a6 100644
--- a/android/src/com/facebook/share/internal/VideoUploader.java
+++ b/android/src/com/facebook/share/internal/VideoUploader.java
@@ -93,7 +93,7 @@ public class VideoUploader {
private static Handler handler;
private static WorkQueue uploadQueue = new WorkQueue(UPLOAD_QUEUE_MAX_CONCURRENT);
- private static Set<UploadContext> pendingUploads = new HashSet<>();
+ private static Set<UploadContext> pendingUploads = new HashSet<UploadContext>();
private static AccessTokenTracker accessTokenTracker;
diff --git a/android/src/com/facebook/share/model/GameRequestContent.java b/android/src/com/facebook/share/model/GameRequestContent.java
index ee6e30c..a9b9ba9 100644
--- a/android/src/com/facebook/share/model/GameRequestContent.java
+++ b/android/src/com/facebook/share/model/GameRequestContent.java
@@ -68,7 +68,7 @@ public final class GameRequestContent implements ShareModel {
this.actionType = ActionType.valueOf(in.readString());
this.objectId = in.readString();
this.filters = Filters.valueOf(in.readString());
- this.suggestions = new ArrayList<>();
+ this.suggestions = new ArrayList<String>();
in.readStringList(this.suggestions);
}
diff --git a/android/src/com/facebook/share/model/SharePhoto.java b/android/src/com/facebook/share/model/SharePhoto.java
index dcf8a50..b338e80 100644
--- a/android/src/com/facebook/share/model/SharePhoto.java
+++ b/android/src/com/facebook/share/model/SharePhoto.java
@@ -203,7 +203,7 @@ public final class SharePhoto extends ShareMedia {
}
public static void writeListTo(final Parcel out, final List<SharePhoto> photos) {
- final List<SharePhoto> list = new ArrayList<>();
+ final List<SharePhoto> list = new ArrayList<SharePhoto>();
for (SharePhoto photo : photos) {
list.add(photo);
}
@@ -211,7 +211,7 @@ public final class SharePhoto extends ShareMedia {
}
public static List<SharePhoto> readListFrom(final Parcel in) {
- final List<SharePhoto> list = new ArrayList<>();
+ final List<SharePhoto> list = new ArrayList<SharePhoto>();
in.readTypedList(list, CREATOR);
return list;
}
diff --git a/android/src/com/facebook/share/widget/AppInviteDialog.java b/android/src/com/facebook/share/widget/AppInviteDialog.java
index f901fdc..c224653 100644
--- a/android/src/com/facebook/share/widget/AppInviteDialog.java
+++ b/android/src/com/facebook/share/widget/AppInviteDialog.java
@@ -176,7 +176,7 @@ public class AppInviteDialog
@Override
protected List<ModeHandler> getOrderedModeHandlers() {
- ArrayList<ModeHandler> handlers = new ArrayList<>();
+ ArrayList<ModeHandler> handlers = new ArrayList<ModeHandler>();
handlers.add(new NativeHandler());
handlers.add(new WebFallbackHandler());
diff --git a/android/src/com/facebook/share/widget/CreateAppGroupDialog.java b/android/src/com/facebook/share/widget/CreateAppGroupDialog.java
index dc04557..e108845 100644
--- a/android/src/com/facebook/share/widget/CreateAppGroupDialog.java
+++ b/android/src/com/facebook/share/widget/CreateAppGroupDialog.java
@@ -153,7 +153,7 @@ public class CreateAppGroupDialog
@Override
protected List<ModeHandler> getOrderedModeHandlers() {
- ArrayList<ModeHandler> handlers = new ArrayList<>();
+ ArrayList<ModeHandler> handlers = new ArrayList<ModeHandler>();
handlers.add(new WebHandler());
return handlers;
diff --git a/android/src/com/facebook/share/widget/GameRequestDialog.java b/android/src/com/facebook/share/widget/GameRequestDialog.java
index 875bd6d..e3c006b 100644
--- a/android/src/com/facebook/share/widget/GameRequestDialog.java
+++ b/android/src/com/facebook/share/widget/GameRequestDialog.java
@@ -173,7 +173,7 @@ public class GameRequestDialog
@Override
protected List<ModeHandler> getOrderedModeHandlers() {
- ArrayList<ModeHandler> handlers = new ArrayList<>();
+ ArrayList<ModeHandler> handlers = new ArrayList<ModeHandler>();
handlers.add(new WebHandler());
return handlers;
diff --git a/android/src/com/facebook/share/widget/JoinAppGroupDialog.java b/android/src/com/facebook/share/widget/JoinAppGroupDialog.java
index 590a1c9..05646af 100644
--- a/android/src/com/facebook/share/widget/JoinAppGroupDialog.java
+++ b/android/src/com/facebook/share/widget/JoinAppGroupDialog.java
@@ -152,7 +152,7 @@ public class JoinAppGroupDialog extends FacebookDialogBase<String, JoinAppGroupD
@Override
protected List<ModeHandler> getOrderedModeHandlers() {
- ArrayList<ModeHandler> handlers = new ArrayList<>();
+ ArrayList<ModeHandler> handlers = new ArrayList<ModeHandler>();
handlers.add(new WebHandler());
return handlers;
diff --git a/android/src/com/facebook/share/widget/MessageDialog.java b/android/src/com/facebook/share/widget/MessageDialog.java
index a6081cf..4d64d1a 100644
--- a/android/src/com/facebook/share/widget/MessageDialog.java
+++ b/android/src/com/facebook/share/widget/MessageDialog.java
@@ -152,7 +152,7 @@ public final class MessageDialog
@Override
protected List<ModeHandler> getOrderedModeHandlers() {
- ArrayList<ModeHandler> handlers = new ArrayList<>();
+ ArrayList<ModeHandler> handlers = new ArrayList<ModeHandler>();
handlers.add(new NativeHandler());
return handlers;
diff --git a/android/src/com/facebook/share/widget/ShareDialog.java b/android/src/com/facebook/share/widget/ShareDialog.java
index 733a14d..83e20d6 100644
--- a/android/src/com/facebook/share/widget/ShareDialog.java
+++ b/android/src/com/facebook/share/widget/ShareDialog.java
@@ -222,7 +222,7 @@ public final class ShareDialog
@Override
protected List<ModeHandler> getOrderedModeHandlers() {
- ArrayList<ModeHandler> handlers = new ArrayList<>();
+ ArrayList<ModeHandler> handlers = new ArrayList<ModeHandler>();
handlers.add(new NativeHandler());
handlers.add(new FeedHandler()); // Feed takes precedence for link-shares for Mode.AUTOMATIC
handlers.add(new WebShareHandler());
diff --git a/android/src/com/freshplanet/ane/AirFacebook/functions/InitFacebookFunction.java b/android/src/com/freshplanet/ane/AirFacebook/functions/InitFacebookFunction.java
index a2a04e0..a72bc2a 100644
--- a/android/src/com/freshplanet/ane/AirFacebook/functions/InitFacebookFunction.java
+++ b/android/src/com/freshplanet/ane/AirFacebook/functions/InitFacebookFunction.java
@@ -15,7 +15,8 @@ public class InitFacebookFunction extends BaseFunction
String appID = getStringFromFREObject(args[0]);
Bundle metaData = context.getActivity().getApplicationContext().getApplicationInfo().metaData;
- String appIdFromMetadata = metaData != null ? metaData.getString("com.facebook.sdk.ApplicationId") : null;
+ Object appIdObject = metaData != null ? metaData.get("com.facebook.sdk.ApplicationId") : null;
+ String appIdFromMetadata = appIdObject != null && appIdObject instanceof String ? (String) appIdObject : null;
AirFacebookExtension.log("FB application ID from AndroidManifest.xml: " + appIdFromMetadata != null ? appIdFromMetadata : "no metadata");
if(appIdFromMetadata == null && appID != null) {
diff --git a/build/build.xml b/build/build.xml
index efc4ebc..2dbe938 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -60,7 +60,7 @@
<echo message="Using Java version ${ant.java.version}."/>
<exec executable="/usr/libexec/java_home" outputproperty="java7home">
- <arg line="-v 1.7" />
+ <arg line="-v 1.6" />
</exec>
<echo message="Java 7 Home: ${java7home}" />
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment