Merge pull request #14 from Slyce-Inc/dev

made loadMoreMessages() async
Slyce-Inc · Aug 4, 2016 · 497b95e · 497b95e
2 parents 375db75 + 053edb8
commit 497b95e
Show file tree

Hide file tree

Showing 49 changed files with 4,217 additions and 15 deletions.
diff --git a/local.properties b/local.properties
@@ -7,5 +7,6 @@
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-#Thu Jul 14 11:04:11 EDT 2016
-sdk.dir=/usr/local/android-sdk-linux
+#Thu Aug 04 08:03:53 EDT 2016
+ndk.dir=/Users/matthewpage/Library/Android/sdk/ndk-bundle
+sdk.dir=/Users/MatthewPage/Library/Android/sdk
diff --git a/slyce-messaging/.idea/.name b/slyce-messaging/.idea/.name
diff --git a/slyce-messaging/.idea/compiler.xml b/slyce-messaging/.idea/compiler.xml
diff --git a/slyce-messaging/.idea/copyright/profiles_settings.xml b/slyce-messaging/.idea/copyright/profiles_settings.xml
diff --git a/slyce-messaging/.idea/encodings.xml b/slyce-messaging/.idea/encodings.xml
diff --git a/slyce-messaging/.idea/gradle.xml b/slyce-messaging/.idea/gradle.xml
diff --git a/slyce-messaging/.idea/libraries/accessibility_test_framework_2_0.xml b/slyce-messaging/.idea/libraries/accessibility_test_framework_2_0.xml
diff --git a/slyce-messaging/.idea/libraries/android_android_24.xml b/slyce-messaging/.idea/libraries/android_android_24.xml
diff --git a/slyce-messaging/.idea/libraries/animated_vector_drawable_24_1_1.xml b/slyce-messaging/.idea/libraries/animated_vector_drawable_24_1_1.xml
diff --git a/slyce-messaging/.idea/libraries/appcompat_v7_24_1_1.xml b/slyce-messaging/.idea/libraries/appcompat_v7_24_1_1.xml
diff --git a/slyce-messaging/.idea/libraries/cam2_0_6_2.xml b/slyce-messaging/.idea/libraries/cam2_0_6_2.xml
diff --git a/slyce-messaging/.idea/libraries/circleimageview_2_1_0.xml b/slyce-messaging/.idea/libraries/circleimageview_2_1_0.xml
diff --git a/slyce-messaging/.idea/libraries/design_24_1_1.xml b/slyce-messaging/.idea/libraries/design_24_1_1.xml
diff --git a/slyce-messaging/.idea/libraries/espresso_contrib_2_2_2.xml b/slyce-messaging/.idea/libraries/espresso_contrib_2_2_2.xml
diff --git a/slyce-messaging/.idea/libraries/espresso_core_2_2_2.xml b/slyce-messaging/.idea/libraries/espresso_core_2_2_2.xml
diff --git a/slyce-messaging/.idea/libraries/espresso_idling_resource_2_2_2.xml b/slyce-messaging/.idea/libraries/espresso_idling_resource_2_2_2.xml
diff --git a/slyce-messaging/.idea/libraries/eventbus_2_4_0.xml b/slyce-messaging/.idea/libraries/eventbus_2_4_0.xml
diff --git a/slyce-messaging/.idea/libraries/exposed_instrumentation_api_publish_0_5.xml b/slyce-messaging/.idea/libraries/exposed_instrumentation_api_publish_0_5.xml
diff --git a/slyce-messaging/.idea/libraries/fab_1_6_2.xml b/slyce-messaging/.idea/libraries/fab_1_6_2.xml
diff --git a/slyce-messaging/.idea/libraries/glide_3_7_0.xml b/slyce-messaging/.idea/libraries/glide_3_7_0.xml
diff --git a/slyce-messaging/.idea/libraries/hamcrest_core_1_3.xml b/slyce-messaging/.idea/libraries/hamcrest_core_1_3.xml
diff --git a/slyce-messaging/.idea/libraries/hamcrest_integration_1_3.xml b/slyce-messaging/.idea/libraries/hamcrest_integration_1_3.xml
diff --git a/slyce-messaging/.idea/libraries/hamcrest_library_1_3.xml b/slyce-messaging/.idea/libraries/hamcrest_library_1_3.xml
diff --git a/slyce-messaging/.idea/libraries/javawriter_2_1_1.xml b/slyce-messaging/.idea/libraries/javawriter_2_1_1.xml
diff --git a/slyce-messaging/.idea/libraries/javax_annotation_api_1_2.xml b/slyce-messaging/.idea/libraries/javax_annotation_api_1_2.xml
diff --git a/slyce-messaging/.idea/libraries/javax_inject_1.xml b/slyce-messaging/.idea/libraries/javax_inject_1.xml
diff --git a/slyce-messaging/.idea/libraries/jsr305_2_0_1.xml b/slyce-messaging/.idea/libraries/jsr305_2_0_1.xml
diff --git a/slyce-messaging/.idea/libraries/junit_4_12.xml b/slyce-messaging/.idea/libraries/junit_4_12.xml
diff --git a/slyce-messaging/.idea/libraries/multidex_1_0_1.xml b/slyce-messaging/.idea/libraries/multidex_1_0_1.xml
diff --git a/slyce-messaging/.idea/libraries/multidex_instrumentation_1_0_1.xml b/slyce-messaging/.idea/libraries/multidex_instrumentation_1_0_1.xml