diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c2e1adf --- /dev/null +++ b/.gitignore @@ -0,0 +1,7 @@ +.classpath +.project +.settings/ + +bin/ +gen/ +lint.xml diff --git a/Android/PebbleKit/src/com/getpebble/android/kit/util/PebbleDictionary.java b/Android/PebbleKit/src/com/getpebble/android/kit/util/PebbleDictionary.java index be5fa1b..27f7cc7 100644 --- a/Android/PebbleKit/src/com/getpebble/android/kit/util/PebbleDictionary.java +++ b/Android/PebbleKit/src/com/getpebble/android/kit/util/PebbleDictionary.java @@ -348,7 +348,7 @@ public static PebbleDictionary fromJson(String jsonString) throws JSONException return d; } - private static JSONObject serializeTuple(PebbleTuple t) throws JSONException { + public static JSONObject serializeTuple(PebbleTuple t) throws JSONException { JSONObject j = new JSONObject(); j.put(KEY, t.key); j.put(TYPE, t.type.getName()); diff --git a/Android/PebbleKit/src/com/getpebble/android/kit/util/PebbleTuple.java b/Android/PebbleKit/src/com/getpebble/android/kit/util/PebbleTuple.java index 9588afa..ea78921 100644 --- a/Android/PebbleKit/src/com/getpebble/android/kit/util/PebbleTuple.java +++ b/Android/PebbleKit/src/com/getpebble/android/kit/util/PebbleTuple.java @@ -9,7 +9,7 @@ * * @author zulak@getpebble.com */ -final class PebbleTuple { +public final class PebbleTuple { private static final Charset UTF8 = Charset.forName("UTF-8"); diff --git a/Android/PebbleKitExample/lib/gcm.jar b/Android/PebbleKitExample/libs/gcm.jar similarity index 100% rename from Android/PebbleKitExample/lib/gcm.jar rename to Android/PebbleKitExample/libs/gcm.jar