Merge commit 'refs/pull/556/head' of github.com:apache/usergrid
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/ae568416 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/ae568416 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/ae568416 Branch: refs/heads/master Commit: ae5684164f3eb2da702f7ecb00983b295169ea4d Parents: 49e0f50 f1b0f98 Author: Michael Russo <[email protected]> Authored: Fri Sep 2 10:25:09 2016 -0700 Committer: Michael Russo <[email protected]> Committed: Fri Sep 2 10:25:09 2016 -0700 ---------------------------------------------------------------------- sdks/android/.gitignore | 20 - sdks/android/LICENSE | 202 -- sdks/android/LICENSE.txt | 19 + sdks/android/NOTICE | 12 - sdks/android/README.md | 622 +++- sdks/android/README.txt | 13 - sdks/android/Samples/ActivityFeed/.gitignore | 8 + .../ActivityFeed/activityfeed/.gitignore | 1 + .../ActivityFeed/activityfeed/build.gradle | 27 + .../ActivityFeed/activityfeed/libs/gcm.jar | Bin 0 -> 13662 bytes .../activityfeed/proguard-rules.pro | 17 + .../usergrid/activityfeed/ApplicationTest.java | 13 + .../activityfeed/src/main/AndroidManifest.xml | 53 + .../usergrid/activityfeed/ActivityEntity.java | 86 + .../usergrid/activityfeed/GCMIntentService.java | 87 + .../usergrid/activityfeed/UsergridManager.java | 259 ++ .../activities/CreateAccountActivity.java | 67 + .../activityfeed/activities/FeedActivity.java | 142 + .../activityfeed/activities/FollowActivity.java | 59 + .../activityfeed/activities/MainActivity.java | 87 + .../callbacks/GetFeedMessagesCallback.java | 27 + .../callbacks/PostFeedMessageCallback.java | 25 + .../activityfeed/helpers/ActionBarHelpers.java | 53 + .../helpers/AlertDialogHelpers.java | 61 + .../activityfeed/helpers/FeedAdapter.java | 153 + .../src/main/res/drawable/in_message_bg.9.png | Bin 0 -> 1160 bytes .../src/main/res/drawable/out_message_bg.9.png | Bin 0 -> 1072 bytes .../src/main/res/drawable/usergridguy.png | Bin 0 -> 6230 bytes .../src/main/res/layout/action_bar_layout.xml | 29 + .../main/res/layout/activity_create_account.xml | 101 + .../src/main/res/layout/activity_feed.xml | 46 + .../src/main/res/layout/activity_follow.xml | 44 + .../src/main/res/layout/activity_main.xml | 85 + .../src/main/res/layout/message_layout.xml | 43 + .../main/res/layout/scrollable_alert_view.xml | 35 + .../src/main/res/mipmap-hdpi/ic_launcher.png | Bin 0 -> 3418 bytes .../src/main/res/mipmap-mdpi/ic_launcher.png | Bin 0 -> 2206 bytes .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 0 -> 4842 bytes .../src/main/res/mipmap-xxhdpi/ic_launcher.png | Bin 0 -> 7718 bytes .../src/main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 0 -> 10486 bytes .../src/main/res/values-w820dp/dimens.xml | 6 + .../activityfeed/src/main/res/values/colors.xml | 8 + .../activityfeed/src/main/res/values/dimens.xml | 5 + .../src/main/res/values/strings.xml | 3 + .../activityfeed/src/main/res/values/styles.xml | 19 + .../usergrid/activityfeed/ExampleUnitTest.java | 15 + sdks/android/Samples/ActivityFeed/build.gradle | 23 + .../Samples/ActivityFeed/gradle.properties | 18 + .../gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 53636 bytes .../gradle/wrapper/gradle-wrapper.properties | 6 + sdks/android/Samples/ActivityFeed/gradlew | 160 + sdks/android/Samples/ActivityFeed/gradlew.bat | 90 + .../Samples/ActivityFeed/settings.gradle | 2 + sdks/android/Samples/Push/.gitignore | 8 + sdks/android/Samples/Push/build.gradle | 22 + sdks/android/Samples/Push/gradle.properties | 18 + .../Push/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 53636 bytes .../gradle/wrapper/gradle-wrapper.properties | 6 + sdks/android/Samples/Push/gradlew | 160 + sdks/android/Samples/Push/gradlew.bat | 90 + sdks/android/Samples/Push/push/.gitignore | 1 + sdks/android/Samples/Push/push/build.gradle | 27 + sdks/android/Samples/Push/push/libs/gcm.jar | Bin 0 -> 13662 bytes .../Samples/Push/push/proguard-rules.pro | 17 + .../apache/usergrid/push/ApplicationTest.java | 13 + .../Push/push/src/main/AndroidManifest.xml | 51 + .../apache/usergrid/push/GCMIntentService.java | 85 + .../org/apache/usergrid/push/MainActivity.java | 162 + .../apache/usergrid/push/SettingsActivity.java | 68 + .../Push/push/src/main/res/drawable/info.png | Bin 0 -> 44546 bytes .../push/src/main/res/drawable/usergridguy.png | Bin 0 -> 6230 bytes .../push/src/main/res/layout/activity_main.xml | 69 + .../src/main/res/layout/activity_settings.xml | 95 + .../src/main/res/mipmap-hdpi/ic_launcher.png | Bin 0 -> 3418 bytes .../src/main/res/mipmap-mdpi/ic_launcher.png | Bin 0 -> 2206 bytes .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 0 -> 4842 bytes .../src/main/res/mipmap-xxhdpi/ic_launcher.png | Bin 0 -> 7718 bytes .../src/main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 0 -> 10486 bytes .../push/src/main/res/values-w820dp/dimens.xml | 6 + .../Push/push/src/main/res/values/colors.xml | 6 + .../Push/push/src/main/res/values/dimens.xml | 5 + .../Push/push/src/main/res/values/strings.xml | 3 + .../Push/push/src/main/res/values/styles.xml | 11 + .../apache/usergrid/push/ExampleUnitTest.java | 15 + sdks/android/Samples/Push/settings.gradle | 2 + sdks/android/UsergridAndroidSDK/.gitignore | 8 + sdks/android/UsergridAndroidSDK/build.gradle | 70 + .../gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 53636 bytes .../gradle/wrapper/gradle-wrapper.properties | 6 + sdks/android/UsergridAndroidSDK/gradlew | 160 + sdks/android/UsergridAndroidSDK/gradlew.bat | 90 + .../libs/usergrid-java-client-2.1.0.jar | Bin 0 -> 1991936 bytes .../UsergridAndroidSDK/proguard-rules.pro | 17 + .../usergrid/android/ApplicationTest.java | 75 + .../java/org/apache/usergrid/android/Book.java | 26 + .../src/main/AndroidManifest.xml | 17 + .../apache/usergrid/android/UsergridAsync.java | 474 +++ .../usergrid/android/UsergridEntityAsync.java | 110 + .../usergrid/android/UsergridResponseAsync.java | 38 + .../usergrid/android/UsergridSharedDevice.java | 175 + .../usergrid/android/UsergridUserAsync.java | 125 + .../UsergridCheckAvailabilityCallback.java | 21 + .../callbacks/UsergridResponseCallback.java | 24 + .../android/tasks/UsergridAsyncTask.java | 45 + .../src/main/res/values/strings.xml | 3 + sdks/android/assembly.xml | 55 - sdks/android/build_release_zip.sh | 10 - sdks/android/pom.xml | 106 - .../usergrid/android/sdk/CounterIncrement.java | 72 - .../sdk/DefaultURLConnectionFactory.java | 36 - .../apache/usergrid/android/sdk/UGClient.java | 3181 ------------------ .../android/sdk/URLConnectionFactory.java | 30 - .../sdk/callbacks/ApiResponseCallback.java | 31 - .../android/sdk/callbacks/ClientAsyncTask.java | 66 - .../android/sdk/callbacks/ClientCallback.java | 31 - .../sdk/callbacks/GroupsRetrievedCallback.java | 35 - .../sdk/callbacks/QueryResultsCallback.java | 33 - .../usergrid/android/sdk/entities/Activity.java | 1019 ------ .../android/sdk/entities/Collection.java | 338 -- .../usergrid/android/sdk/entities/Device.java | 122 - .../usergrid/android/sdk/entities/Entity.java | 552 --- .../usergrid/android/sdk/entities/Group.java | 151 - .../usergrid/android/sdk/entities/Message.java | 159 - .../usergrid/android/sdk/entities/User.java | 315 -- .../android/sdk/exception/ClientException.java | 43 - .../android/sdk/response/AggregateCounter.java | 58 - .../sdk/response/AggregateCounterSet.java | 117 - .../android/sdk/response/ApiResponse.java | 774 ----- .../sdk/response/ClientCredentialsInfo.java | 64 - .../android/sdk/response/QueueInfo.java | 47 - .../android/sdk/utils/DeviceUuidFactory.java | 173 - .../usergrid/android/sdk/utils/JsonUtils.java | 185 - .../usergrid/android/sdk/utils/MapUtils.java | 42 - .../usergrid/android/sdk/utils/ObjectUtils.java | 39 - .../usergrid/android/sdk/utils/UrlUtils.java | 127 - 135 files changed, 4996 insertions(+), 8290 deletions(-) ----------------------------------------------------------------------
