You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by mr...@apache.org on 2016/09/02 17:28:16 UTC
[1/3] usergrid-android git commit: Initial commit of Usergrid Android
SDK in its own repo.
Repository: usergrid-android
Updated Branches:
refs/heads/master [created] 4a794e46a
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/Push/push/src/main/res/mipmap-xxxhdpi/ic_launcher.png
----------------------------------------------------------------------
diff --git a/Samples/Push/push/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/Samples/Push/push/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000..aee44e1
Binary files /dev/null and b/Samples/Push/push/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/Push/push/src/main/res/values-w820dp/dimens.xml
----------------------------------------------------------------------
diff --git a/Samples/Push/push/src/main/res/values-w820dp/dimens.xml b/Samples/Push/push/src/main/res/values-w820dp/dimens.xml
new file mode 100644
index 0000000..63fc816
--- /dev/null
+++ b/Samples/Push/push/src/main/res/values-w820dp/dimens.xml
@@ -0,0 +1,6 @@
+<resources>
+ <!-- Example customization of dimensions originally defined in res/values/dimens.xml
+ (such as screen margins) for screens with more than 820dp of available width. This
+ would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
+ <dimen name="activity_horizontal_margin">64dp</dimen>
+</resources>
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/Push/push/src/main/res/values/colors.xml
----------------------------------------------------------------------
diff --git a/Samples/Push/push/src/main/res/values/colors.xml b/Samples/Push/push/src/main/res/values/colors.xml
new file mode 100644
index 0000000..75703af
--- /dev/null
+++ b/Samples/Push/push/src/main/res/values/colors.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <color name="colorPrimary">#1b5d89</color>
+ <color name="colorPrimaryDark">#303F9F</color>
+ <color name="colorAccent">#FF4081</color>
+</resources>
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/Push/push/src/main/res/values/dimens.xml
----------------------------------------------------------------------
diff --git a/Samples/Push/push/src/main/res/values/dimens.xml b/Samples/Push/push/src/main/res/values/dimens.xml
new file mode 100644
index 0000000..47c8224
--- /dev/null
+++ b/Samples/Push/push/src/main/res/values/dimens.xml
@@ -0,0 +1,5 @@
+<resources>
+ <!-- Default screen margins, per the Android Design guidelines. -->
+ <dimen name="activity_horizontal_margin">16dp</dimen>
+ <dimen name="activity_vertical_margin">16dp</dimen>
+</resources>
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/Push/push/src/main/res/values/strings.xml
----------------------------------------------------------------------
diff --git a/Samples/Push/push/src/main/res/values/strings.xml b/Samples/Push/push/src/main/res/values/strings.xml
new file mode 100644
index 0000000..f0817ce
--- /dev/null
+++ b/Samples/Push/push/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+ <string name="app_name">Apigee Push</string>
+</resources>
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/Push/push/src/main/res/values/styles.xml
----------------------------------------------------------------------
diff --git a/Samples/Push/push/src/main/res/values/styles.xml b/Samples/Push/push/src/main/res/values/styles.xml
new file mode 100644
index 0000000..0eb88fe
--- /dev/null
+++ b/Samples/Push/push/src/main/res/values/styles.xml
@@ -0,0 +1,11 @@
+<resources>
+
+ <!-- Base application theme. -->
+ <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+ <!-- Customize your theme here. -->
+ <item name="colorPrimary">@color/colorPrimary</item>
+ <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+ <item name="colorAccent">@color/colorAccent</item>
+ </style>
+
+</resources>
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/Push/push/src/test/java/org/apache/usergrid/push/ExampleUnitTest.java
----------------------------------------------------------------------
diff --git a/Samples/Push/push/src/test/java/org/apache/usergrid/push/ExampleUnitTest.java b/Samples/Push/push/src/test/java/org/apache/usergrid/push/ExampleUnitTest.java
new file mode 100644
index 0000000..fcc42bf
--- /dev/null
+++ b/Samples/Push/push/src/test/java/org/apache/usergrid/push/ExampleUnitTest.java
@@ -0,0 +1,15 @@
+package org.apache.usergrid.push;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * To work on unit tests, switch the Test Artifact in the Build Variants view.
+ */
+public class ExampleUnitTest {
+ @Test
+ public void addition_isCorrect() throws Exception {
+ assertEquals(4, 2 + 2);
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/Push/settings.gradle
----------------------------------------------------------------------
diff --git a/Samples/Push/settings.gradle b/Samples/Push/settings.gradle
new file mode 100644
index 0000000..f1ac978
--- /dev/null
+++ b/Samples/Push/settings.gradle
@@ -0,0 +1,2 @@
+include ':push', ':UsergridAndroidSDK'
+project (":UsergridAndroidSDK").projectDir = new File("../../UsergridAndroidSDK")
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/UsergridAndroidSDK/.gitignore
----------------------------------------------------------------------
diff --git a/UsergridAndroidSDK/.gitignore b/UsergridAndroidSDK/.gitignore
new file mode 100644
index 0000000..c6cbe56
--- /dev/null
+++ b/UsergridAndroidSDK/.gitignore
@@ -0,0 +1,8 @@
+*.iml
+.gradle
+/local.properties
+/.idea/workspace.xml
+/.idea/libraries
+.DS_Store
+/build
+/captures
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/UsergridAndroidSDK/build.gradle
----------------------------------------------------------------------
diff --git a/UsergridAndroidSDK/build.gradle b/UsergridAndroidSDK/build.gradle
new file mode 100644
index 0000000..ef2db46
--- /dev/null
+++ b/UsergridAndroidSDK/build.gradle
@@ -0,0 +1,70 @@
+apply plugin: 'com.android.library'
+apply plugin: 'com.jfrog.bintray'
+apply plugin: 'com.github.dcendents.android-maven'
+
+buildscript {
+ repositories {
+ jcenter()
+ }
+ dependencies {
+ classpath 'com.android.tools.build:gradle:2.1.0'
+ classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.2'
+ classpath "com.github.dcendents:android-maven-gradle-plugin:1.3"
+ }
+}
+
+android {
+ compileSdkVersion 17
+ buildToolsVersion "22.0.1"
+
+ group = 'org.apache.usergrid.android'
+ version = '2.1.0'
+
+ defaultConfig {
+ minSdkVersion 17
+ targetSdkVersion 23
+ versionCode 1
+ versionName "2.1.0"
+ }
+ buildTypes {
+ release {
+ minifyEnabled false
+ proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+ }
+ }
+}
+
+dependencies {
+ repositories {
+ mavenCentral()
+ }
+ compile fileTree(dir: 'libs', include: ['*.jar'])
+ testCompile 'junit:junit:4.12'
+}
+
+task generateSourcesJar(type: Jar) {
+ from android.sourceSets.main.java.srcDirs
+ classifier 'sources'
+}
+artifacts {
+ archives generateSourcesJar
+}
+
+bintray {
+ user = 'rwalsh'
+ key = '3ae2887b2af626dab61faffd57b99303e146feb6'
+ pkg {
+ repo = 'maven'
+ name = 'org.apache.usergrid.android'
+ version {
+ name = '2.1.0'
+ desc = 'Usergrid Android Client'
+ released = new Date()
+ }
+
+ licenses = ['Apache-2.0']
+ vcsUrl = 'https://github.com/apache/usergrid.git'
+ websiteUrl = 'https://github.com/apache/usergrid'
+ }
+ configurations = ['archives']
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/UsergridAndroidSDK/gradle/wrapper/gradle-wrapper.jar
----------------------------------------------------------------------
diff --git a/UsergridAndroidSDK/gradle/wrapper/gradle-wrapper.jar b/UsergridAndroidSDK/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..13372ae
Binary files /dev/null and b/UsergridAndroidSDK/gradle/wrapper/gradle-wrapper.jar differ
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/UsergridAndroidSDK/gradle/wrapper/gradle-wrapper.properties
----------------------------------------------------------------------
diff --git a/UsergridAndroidSDK/gradle/wrapper/gradle-wrapper.properties b/UsergridAndroidSDK/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..122a0dc
--- /dev/null
+++ b/UsergridAndroidSDK/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Mon Dec 28 10:00:20 PST 2015
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/UsergridAndroidSDK/gradlew
----------------------------------------------------------------------
diff --git a/UsergridAndroidSDK/gradlew b/UsergridAndroidSDK/gradlew
new file mode 100644
index 0000000..9d82f78
--- /dev/null
+++ b/UsergridAndroidSDK/gradlew
@@ -0,0 +1,160 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+## Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+ echo "$*"
+}
+
+die ( ) {
+ echo
+ echo "$*"
+ echo
+ exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+ CYGWIN* )
+ cygwin=true
+ ;;
+ Darwin* )
+ darwin=true
+ ;;
+ MINGW* )
+ msys=true
+ ;;
+esac
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG=`dirname "$PRG"`"/$link"
+ fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ if [ ! -x "$JAVACMD" ] ; then
+ die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+ fi
+else
+ JAVACMD="java"
+ which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+ MAX_FD_LIMIT=`ulimit -H -n`
+ if [ $? -eq 0 ] ; then
+ if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+ MAX_FD="$MAX_FD_LIMIT"
+ fi
+ ulimit -n $MAX_FD
+ if [ $? -ne 0 ] ; then
+ warn "Could not set maximum file descriptor limit: $MAX_FD"
+ fi
+ else
+ warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+ fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+ GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+ APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+ CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+ JAVACMD=`cygpath --unix "$JAVACMD"`
+
+ # We build the pattern for arguments to be converted via cygpath
+ ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+ SEP=""
+ for dir in $ROOTDIRSRAW ; do
+ ROOTDIRS="$ROOTDIRS$SEP$dir"
+ SEP="|"
+ done
+ OURCYGPATTERN="(^($ROOTDIRS))"
+ # Add a user-defined pattern to the cygpath arguments
+ if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+ OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+ fi
+ # Now convert the arguments - kludge to limit ourselves to /bin/sh
+ i=0
+ for arg in "$@" ; do
+ CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+ CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
+
+ if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
+ eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+ else
+ eval `echo args$i`="\"$arg\""
+ fi
+ i=$((i+1))
+ done
+ case $i in
+ (0) set -- ;;
+ (1) set -- "$args0" ;;
+ (2) set -- "$args0" "$args1" ;;
+ (3) set -- "$args0" "$args1" "$args2" ;;
+ (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+ (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+ (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+ (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+ (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+ (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+ esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+ JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/UsergridAndroidSDK/gradlew.bat
----------------------------------------------------------------------
diff --git a/UsergridAndroidSDK/gradlew.bat b/UsergridAndroidSDK/gradlew.bat
new file mode 100644
index 0000000..aec9973
--- /dev/null
+++ b/UsergridAndroidSDK/gradlew.bat
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/UsergridAndroidSDK/libs/usergrid-java-client-2.1.0.jar
----------------------------------------------------------------------
diff --git a/UsergridAndroidSDK/libs/usergrid-java-client-2.1.0.jar b/UsergridAndroidSDK/libs/usergrid-java-client-2.1.0.jar
new file mode 100644
index 0000000..d77cd88
Binary files /dev/null and b/UsergridAndroidSDK/libs/usergrid-java-client-2.1.0.jar differ
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/UsergridAndroidSDK/proguard-rules.pro
----------------------------------------------------------------------
diff --git a/UsergridAndroidSDK/proguard-rules.pro b/UsergridAndroidSDK/proguard-rules.pro
new file mode 100644
index 0000000..73ed137
--- /dev/null
+++ b/UsergridAndroidSDK/proguard-rules.pro
@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in /Users/ApigeeCorporation/Developer/android_sdk_files/sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+# http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+# public *;
+#}
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/UsergridAndroidSDK/src/androidTest/java/org/apache/usergrid/android/ApplicationTest.java
----------------------------------------------------------------------
diff --git a/UsergridAndroidSDK/src/androidTest/java/org/apache/usergrid/android/ApplicationTest.java b/UsergridAndroidSDK/src/androidTest/java/org/apache/usergrid/android/ApplicationTest.java
new file mode 100644
index 0000000..484d85e
--- /dev/null
+++ b/UsergridAndroidSDK/src/androidTest/java/org/apache/usergrid/android/ApplicationTest.java
@@ -0,0 +1,75 @@
+package org.apache.usergrid.android;
+
+import android.app.Application;
+import android.test.ApplicationTestCase;
+
+import org.apache.usergrid.android.callbacks.UsergridResponseCallback;
+
+import org.apache.usergrid.java.client.Usergrid;
+import org.apache.usergrid.java.client.model.UsergridEntity;
+import org.apache.usergrid.java.client.response.UsergridResponse;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.concurrent.CountDownLatch;
+
+/**
+ * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
+ */
+public class ApplicationTest extends ApplicationTestCase<Application> {
+
+ Book finishedBook;
+ String newBookTitle = "A new title again at time: " + System.currentTimeMillis();
+
+ public ApplicationTest() {
+ super(Application.class);
+ }
+
+ @Override
+ protected void setUp() throws Exception {
+ Usergrid.initSharedInstance("rwalsh","sandbox");
+ UsergridEntity.mapCustomSubclassToType("book",Book.class);
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ Usergrid.reset();
+ }
+
+ public void testGET() throws InterruptedException {
+ final CountDownLatch signal = new CountDownLatch(1);
+
+ Usergrid.initSharedInstance("rwalsh","sandbox");
+ UsergridAsync.GET("books", new UsergridResponseCallback() {
+ @Override
+ public void onResponse(@NotNull UsergridResponse response) {
+ if (response.ok()) {
+ final Book book = (Book) response.first();
+ assertNotNull(book);
+ assertNotNull(book.getUuid());
+ book.setTitle(newBookTitle);
+ UsergridEntityAsync.save(book, new UsergridResponseCallback() {
+ @Override
+ public void onResponse(@NotNull UsergridResponse response) {
+ final Book book = (Book) response.first();
+ assertNotNull(book);
+ assertNotNull(book.getUuid());
+ assertEquals(book.getTitle(),newBookTitle);
+ UsergridAsync.GET("book", book.getUuid(), new UsergridResponseCallback() {
+ @Override
+ public void onResponse(@NotNull UsergridResponse response) {
+ assertNotNull(response.getEntities());
+ assertNotNull(response.first());
+ finishedBook = (Book) response.first();
+ signal.countDown();
+ }
+ });
+ }
+ });
+ }
+ }
+ });
+ signal.await();
+ assertNotNull(finishedBook);
+ assertEquals(finishedBook.getTitle(),newBookTitle);
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/UsergridAndroidSDK/src/androidTest/java/org/apache/usergrid/android/Book.java
----------------------------------------------------------------------
diff --git a/UsergridAndroidSDK/src/androidTest/java/org/apache/usergrid/android/Book.java b/UsergridAndroidSDK/src/androidTest/java/org/apache/usergrid/android/Book.java
new file mode 100644
index 0000000..a27f237
--- /dev/null
+++ b/UsergridAndroidSDK/src/androidTest/java/org/apache/usergrid/android/Book.java
@@ -0,0 +1,26 @@
+package org.apache.usergrid.android;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import org.apache.usergrid.java.client.model.UsergridEntity;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Created by Robert Walsh on 4/12/16.
+ */
+public class Book extends UsergridEntity {
+ @Nullable private String title;
+
+ public Book(@JsonProperty("type") @NotNull String type) {
+ super(type);
+ }
+
+ public void setTitle(@NotNull final String title) {
+ this.title = title;
+ }
+ public String getTitle() {
+ return this.title;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/UsergridAndroidSDK/src/main/AndroidManifest.xml
----------------------------------------------------------------------
diff --git a/UsergridAndroidSDK/src/main/AndroidManifest.xml b/UsergridAndroidSDK/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..8d9dfe0
--- /dev/null
+++ b/UsergridAndroidSDK/src/main/AndroidManifest.xml
@@ -0,0 +1,17 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="org.apache.usergrid.android">
+ <uses-permission android:name="android.permission.INTERNET" />
+ <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+ <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+ <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+ <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+ <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+ <application
+ android:allowBackup="true"
+ android:label="@string/app_name"
+ android:supportsRtl="true">
+
+ </application>
+
+</manifest>
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/UsergridAndroidSDK/src/main/java/org/apache/usergrid/android/UsergridAsync.java
----------------------------------------------------------------------
diff --git a/UsergridAndroidSDK/src/main/java/org/apache/usergrid/android/UsergridAsync.java b/UsergridAndroidSDK/src/main/java/org/apache/usergrid/android/UsergridAsync.java
new file mode 100644
index 0000000..e701893
--- /dev/null
+++ b/UsergridAndroidSDK/src/main/java/org/apache/usergrid/android/UsergridAsync.java
@@ -0,0 +1,474 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.usergrid.android;
+
+import android.content.Context;
+
+import org.apache.usergrid.android.callbacks.UsergridResponseCallback;
+import org.apache.usergrid.android.tasks.UsergridAsyncTask;
+import org.apache.usergrid.java.client.Usergrid;
+import org.apache.usergrid.java.client.UsergridClient;
+import org.apache.usergrid.java.client.UsergridEnums.UsergridDirection;
+import org.apache.usergrid.java.client.UsergridRequest;
+import org.apache.usergrid.java.client.auth.UsergridAppAuth;
+import org.apache.usergrid.java.client.auth.UsergridUserAuth;
+import org.apache.usergrid.java.client.model.UsergridEntity;
+import org.apache.usergrid.java.client.model.UsergridUser;
+import org.apache.usergrid.java.client.query.UsergridQuery;
+import org.apache.usergrid.java.client.response.UsergridResponse;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.List;
+import java.util.Map;
+
+@SuppressWarnings("unused")
+public final class UsergridAsync {
+
+ private UsergridAsync() { }
+
+ public static void applyPushToken(@NotNull final Context context, @NotNull final String pushToken, @NotNull final String notifier, @NotNull final UsergridResponseCallback responseCallback) {
+ UsergridAsync.applyPushToken(Usergrid.getInstance(),context,pushToken,notifier,responseCallback);
+ }
+
+ public static void applyPushToken(@NotNull final UsergridClient client, @NotNull final Context context, @NotNull final String pushToken, @NotNull final String notifier, @NotNull final UsergridResponseCallback responseCallback) {
+ UsergridSharedDevice.applyPushToken(client,context,notifier,pushToken,responseCallback);
+ }
+
+ public static void authenticateApp(@NotNull final UsergridResponseCallback responseCallback) {
+ UsergridAsync.authenticateApp(Usergrid.getInstance(),responseCallback);
+ }
+
+ public static void authenticateApp(@NotNull final UsergridClient client, @NotNull final UsergridResponseCallback responseCallback) {
+ (new UsergridAsyncTask(responseCallback) {
+ @Override
+ public UsergridResponse doTask() {
+ return client.authenticateApp();
+ }
+ }).execute();
+ }
+
+ public static void authenticateApp(@NotNull final UsergridAppAuth auth, @NotNull final UsergridResponseCallback responseCallback) {
+ UsergridAsync.authenticateApp(Usergrid.getInstance(),auth,responseCallback);
+ }
+
+ public static void authenticateApp(@NotNull final UsergridClient client, @NotNull final UsergridAppAuth auth, @NotNull final UsergridResponseCallback responseCallback) {
+ (new UsergridAsyncTask(responseCallback) {
+ @Override
+ public UsergridResponse doTask() {
+ return client.authenticateApp(auth);
+ }
+ }).execute();
+ }
+
+ public static void authenticateUser(@NotNull final UsergridUserAuth userAuth, @NotNull final UsergridResponseCallback responseCallback) {
+ UsergridAsync.authenticateUser(Usergrid.getInstance(),userAuth,true,responseCallback);
+ }
+
+ public static void authenticateUser(@NotNull final UsergridClient client, @NotNull final UsergridUserAuth userAuth, @NotNull final UsergridResponseCallback responseCallback) {
+ UsergridAsync.authenticateUser(client,userAuth,true,responseCallback);
+ }
+
+ public static void authenticateUser(@NotNull final UsergridUserAuth userAuth, final boolean setAsCurrentUser, @NotNull final UsergridResponseCallback responseCallback) {
+ UsergridAsync.authenticateUser(Usergrid.getInstance(),userAuth,setAsCurrentUser,responseCallback);
+ }
+
+ public static void authenticateUser(@NotNull final UsergridClient client, @NotNull final UsergridUserAuth userAuth, final boolean setAsCurrentUser, @NotNull final UsergridResponseCallback responseCallback) {
+ (new UsergridAsyncTask(responseCallback) {
+ @Override
+ public UsergridResponse doTask() {
+ return client.authenticateUser(userAuth,setAsCurrentUser);
+ }
+ }).execute();
+ }
+
+ public static void resetPassword(@NotNull final UsergridUser user, @NotNull final String oldPassword, @NotNull final String newPassword, @NotNull final UsergridResponseCallback responseCallback) {
+ UsergridAsync.resetPassword(Usergrid.getInstance(),user,oldPassword,newPassword,responseCallback);
+ }
+
+ public static void resetPassword(@NotNull final UsergridClient client, @NotNull final UsergridUser user, @NotNull final String oldPassword, @NotNull final String newPassword, @NotNull final UsergridResponseCallback responseCallback) {
+ (new UsergridAsyncTask(responseCallback) {
+ @Override
+ public UsergridResponse doTask() {
+ return client.resetPassword(user,oldPassword,newPassword);
+ }
+ }).execute();
+ }
+
+ public static void logoutCurrentUser(@NotNull final UsergridResponseCallback responseCallback) {
+ UsergridAsync.logoutCurrentUser(Usergrid.getInstance(),responseCallback);
+ }
+
+ public static void logoutCurrentUser(@NotNull final UsergridClient client, @NotNull final UsergridResponseCallback responseCallback) {
+ (new UsergridAsyncTask(responseCallback) {
+ @Override
+ public UsergridResponse doTask() {
+ return client.logoutCurrentUser();
+ }
+ }).execute();
+ }
+
+ public static void logoutUserAllTokens(@NotNull final String uuidOrUsername, @NotNull final UsergridResponseCallback responseCallback) {
+ UsergridAsync.logoutUser(Usergrid.getInstance(),uuidOrUsername, null, responseCallback);
+ }
+
+ public static void logoutUserAllTokens(@NotNull final UsergridClient client, @NotNull final String uuidOrUsername, @NotNull final UsergridResponseCallback responseCallback) {
+ UsergridAsync.logoutUser(client,uuidOrUsername, null, responseCallback);
+ }
+
+ public static void logoutUser(@NotNull final UsergridClient client, @NotNull final String uuidOrUsername, @Nullable final String token, @NotNull final UsergridResponseCallback responseCallback){
+ (new UsergridAsyncTask(responseCallback) {
+ @Override
+ public UsergridResponse doTask() {
+ return client.logoutUser(uuidOrUsername,token);
+ }
+ }).execute();
+ }
+
+ public static void sendRequest(@NotNull final UsergridRequest request, @NotNull final UsergridResponseCallback responseCallback) {
+ UsergridAsync.sendRequest(Usergrid.getInstance(),request,responseCallback);
+ }
+
+ public static void sendRequest(@NotNull final UsergridClient client, @NotNull final UsergridRequest request, @NotNull final UsergridResponseCallback responseCallback) {
+ (new UsergridAsyncTask(responseCallback) {
+ @Override
+ public UsergridResponse doTask() {
+ return client.sendRequest(request);
+ }
+ }).execute();
+ }
+
+ public static void GET(@NotNull final String collection, @NotNull final String uuidOrName, @NotNull final UsergridResponseCallback responseCallback) {
+ UsergridAsync.GET(Usergrid.getInstance(),collection,uuidOrName,responseCallback);
+ }
+
+ public static void GET(@NotNull final UsergridClient client, @NotNull final String collection, @NotNull final String uuidOrName, @NotNull final UsergridResponseCallback responseCallback) {
+ (new UsergridAsyncTask(responseCallback) {
+ @Override
+ public UsergridResponse doTask() {
+ return client.GET(collection,uuidOrName);
+ }
+ }).execute();
+ }
+
+ public static void GET(@NotNull final String type, @NotNull final UsergridResponseCallback responseCallback) {
+ UsergridAsync.GET(Usergrid.getInstance(),type,responseCallback);
+ }
+
+ public static void GET(@NotNull final UsergridClient client, @NotNull final String type, @NotNull final UsergridResponseCallback responseCallback) {
+ (new UsergridAsyncTask(responseCallback) {
+ @Override
+ public UsergridResponse doTask() {
+ return client.GET(type);
+ }
+ }).execute();
+ }
+
+ public static void GET(@NotNull final UsergridQuery query, @NotNull final UsergridResponseCallback responseCallback) {
+ UsergridAsync.GET(Usergrid.getInstance(),query,responseCallback);
+ }
+
+ public static void GET(@NotNull final UsergridClient client, @NotNull final UsergridQuery query, @NotNull final UsergridResponseCallback responseCallback) {
+ (new UsergridAsyncTask(responseCallback) {
+ @Override
+ public UsergridResponse doTask() {
+ return client.GET(query);
+ }
+ }).execute();
+ }
+
+ public static void PUT(@NotNull final String type, @NotNull final String uuidOrName, @NotNull final Map<String, Object> jsonBody, @NotNull final UsergridResponseCallback responseCallback) {
+ UsergridAsync.PUT(Usergrid.getInstance(),type,uuidOrName,jsonBody,responseCallback);
+ }
+
+ public static void PUT(@NotNull final UsergridClient client, @NotNull final String type, @NotNull final String uuidOrName, @NotNull final Map<String, Object> jsonBody, @NotNull final UsergridResponseCallback responseCallback) {
+ (new UsergridAsyncTask(responseCallback) {
+ @Override
+ public UsergridResponse doTask() {
+ return client.PUT(type, uuidOrName, jsonBody);
+ }
+ }).execute();
+ }
+
+ public static void PUT(@NotNull final String type, @NotNull final Map<String, Object> jsonBody, @NotNull final UsergridResponseCallback responseCallback) {
+ UsergridAsync.PUT(Usergrid.getInstance(),type,jsonBody,responseCallback);
+ }
+
+ public static void PUT(@NotNull final UsergridClient client, @NotNull final String type, @NotNull final Map<String, Object> jsonBody, @NotNull final UsergridResponseCallback responseCallback) {
+ (new UsergridAsyncTask(responseCallback) {
+ @Override
+ public UsergridResponse doTask() {
+ return client.PUT(type, jsonBody);
+ }
+ }).execute();
+ }
+
+ public static void PUT(@NotNull final UsergridEntity entity, @NotNull final UsergridResponseCallback responseCallback) {
+ UsergridAsync.PUT(Usergrid.getInstance(),entity,responseCallback);
+ }
+
+ public static void PUT(@NotNull final UsergridClient client, @NotNull final UsergridEntity entity, @NotNull final UsergridResponseCallback responseCallback) {
+ (new UsergridAsyncTask(responseCallback) {
+ @Override
+ public UsergridResponse doTask() {
+ return client.PUT(entity);
+ }
+ }).execute();
+ }
+
+ public static void PUT(@NotNull final UsergridQuery query, @NotNull final Map<String, Object> jsonBody, @NotNull final UsergridResponseCallback responseCallback) {
+ UsergridAsync.PUT(Usergrid.getInstance(),query,jsonBody,responseCallback);
+ }
+
+ public static void PUT(@NotNull final UsergridClient client, @NotNull final UsergridQuery query, @NotNull final Map<String, Object> jsonBody, @NotNull final UsergridResponseCallback responseCallback) {
+ (new UsergridAsyncTask(responseCallback) {
+ @Override
+ public UsergridResponse doTask() {
+ return client.PUT(query, jsonBody);
+ }
+ }).execute();
+ }
+
+ public static void POST(@NotNull final UsergridEntity entity, @NotNull final UsergridResponseCallback responseCallback) {
+ UsergridAsync.POST(Usergrid.getInstance(),entity,responseCallback);
+ }
+
+ public static void POST(@NotNull final UsergridClient client, @NotNull final UsergridEntity entity, @NotNull final UsergridResponseCallback responseCallback) {
+ (new UsergridAsyncTask(responseCallback) {
+ @Override
+ public UsergridResponse doTask() {
+ return client.PUT(entity);
+ }
+ }).execute();
+ }
+
+ public static void POST(@NotNull final List<UsergridEntity> entities, @NotNull final UsergridResponseCallback responseCallback) {
+ UsergridAsync.POST(Usergrid.getInstance(),entities,responseCallback);
+ }
+
+ public static void POST(@NotNull final UsergridClient client, @NotNull final List<UsergridEntity> entities, @NotNull final UsergridResponseCallback responseCallback) {
+ (new UsergridAsyncTask(responseCallback) {
+ @Override
+ public UsergridResponse doTask() {
+ return client.POST(entities);
+ }
+ }).execute();
+ }
+
+ public static void POST(@NotNull final String type, @NotNull final String uuidOrName, @NotNull final Map<String, ?> jsonBody, @NotNull final UsergridResponseCallback responseCallback) {
+ UsergridAsync.POST(Usergrid.getInstance(),type,uuidOrName,jsonBody,responseCallback);
+ }
+
+ public static void POST(@NotNull final UsergridClient client, @NotNull final String type, @NotNull final String uuidOrName, @NotNull final Map<String, ?> jsonBody, @NotNull final UsergridResponseCallback responseCallback) {
+ (new UsergridAsyncTask(responseCallback) {
+ @Override
+ public UsergridResponse doTask() {
+ return client.POST(type, uuidOrName, jsonBody);
+ }
+ }).execute();
+ }
+
+ public static void POST(@NotNull final String type, @NotNull final Map<String, ?> jsonBody, @NotNull final UsergridResponseCallback responseCallback) {
+ UsergridAsync.POST(Usergrid.getInstance(),type,jsonBody,responseCallback);
+ }
+
+ public static void POST(@NotNull final UsergridClient client, @NotNull final String type, @NotNull final Map<String, ?> jsonBody, @NotNull final UsergridResponseCallback responseCallback) {
+ (new UsergridAsyncTask(responseCallback) {
+ @Override
+ public UsergridResponse doTask() {
+ return client.POST(type, jsonBody);
+ }
+ }).execute();
+ }
+
+ public static void POST(@NotNull final String type, @NotNull final List<Map<String, ?>> jsonBodies, @NotNull final UsergridResponseCallback responseCallback) {
+ UsergridAsync.POST(Usergrid.getInstance(),type,jsonBodies,responseCallback);
+ }
+
+ public static void POST(@NotNull final UsergridClient client, @NotNull final String type, @NotNull final List<Map<String, ?>> jsonBodies, @NotNull final UsergridResponseCallback responseCallback) {
+ (new UsergridAsyncTask(responseCallback) {
+ @Override
+ public UsergridResponse doTask() {
+ return client.POST(type, jsonBodies);
+ }
+ }).execute();
+ }
+
+ public static void DELETE(@NotNull final UsergridEntity entity, @NotNull final UsergridResponseCallback responseCallback) {
+ UsergridAsync.DELETE(Usergrid.getInstance(),entity,responseCallback);
+ }
+
+ public static void DELETE(@NotNull final UsergridClient client, @NotNull final UsergridEntity entity, @NotNull final UsergridResponseCallback responseCallback) {
+ (new UsergridAsyncTask(responseCallback) {
+ @Override
+ public UsergridResponse doTask() {
+ return client.DELETE(entity);
+ }
+ }).execute();
+ }
+
+ public static void DELETE(@NotNull final String type, @NotNull final String uuidOrName, @NotNull final UsergridResponseCallback responseCallback) {
+ UsergridAsync.DELETE(Usergrid.getInstance(),type,uuidOrName,responseCallback);
+ }
+
+ public static void DELETE(@NotNull final UsergridClient client, @NotNull final String type, @NotNull final String uuidOrName, @NotNull final UsergridResponseCallback responseCallback) {
+ (new UsergridAsyncTask(responseCallback) {
+ @Override
+ public UsergridResponse doTask() {
+ return client.DELETE(type, uuidOrName);
+ }
+ }).execute();
+ }
+
+ public static void DELETE(@NotNull final UsergridQuery query, @NotNull final UsergridResponseCallback responseCallback) {
+ UsergridAsync.DELETE(Usergrid.getInstance(),query,responseCallback);
+ }
+
+ public static void DELETE(@NotNull final UsergridClient client, @NotNull final UsergridQuery query, @NotNull final UsergridResponseCallback responseCallback) {
+ (new UsergridAsyncTask(responseCallback) {
+ @Override
+ public UsergridResponse doTask() {
+ return client.DELETE(query);
+ }
+ }).execute();
+ }
+
+ public static void connect(@NotNull final UsergridEntity entity, @NotNull final String relationship, @NotNull final UsergridEntity to, @NotNull final UsergridResponseCallback responseCallback) {
+ UsergridAsync.connect(Usergrid.getInstance(),entity,relationship,to,responseCallback);
+ }
+
+ public static void connect(@NotNull final UsergridClient client, @NotNull final UsergridEntity entity, @NotNull final String relationship, @NotNull final UsergridEntity to, @NotNull final UsergridResponseCallback responseCallback) {
+ (new UsergridAsyncTask(responseCallback) {
+ @Override
+ public UsergridResponse doTask() {
+ return client.connect(entity, relationship, to);
+ }
+ }).execute();
+ }
+
+ public static void connect(@NotNull final String entityType, @NotNull final String entityId, @NotNull final String relationship, @NotNull final String toType, @NotNull final String toName, @NotNull final UsergridResponseCallback responseCallback) {
+ UsergridAsync.connect(Usergrid.getInstance(),entityType,entityId,relationship,toType,toName,responseCallback);
+ }
+
+ public static void connect(@NotNull final UsergridClient client, @NotNull final String entityType, @NotNull final String entityId, @NotNull final String relationship, @NotNull final String toType, @NotNull final String toName, @NotNull final UsergridResponseCallback responseCallback) {
+ (new UsergridAsyncTask(responseCallback) {
+ @Override
+ public UsergridResponse doTask() {
+ return client.connect(entityType, entityId, relationship, toType, toName);
+ }
+ }).execute();
+ }
+
+ public static void connect(@NotNull final String entityType, @NotNull final String entityId, @NotNull final String relationship, @NotNull final String toId, @NotNull final UsergridResponseCallback responseCallback) {
+ UsergridAsync.connect(Usergrid.getInstance(),entityType,entityId,relationship,toId,responseCallback);
+ }
+
+ public static void connect(@NotNull final UsergridClient client, @NotNull final String entityType, @NotNull final String entityId, @NotNull final String relationship, @NotNull final String toId, @NotNull final UsergridResponseCallback responseCallback) {
+ (new UsergridAsyncTask(responseCallback) {
+ @Override
+ public UsergridResponse doTask() {
+ return client.connect(entityType, entityId, relationship, toId);
+ }
+ }).execute();
+ }
+
+ public static void disconnect(@NotNull final String entityType, @NotNull final String entityId, @NotNull final String relationship, @NotNull final String fromUuid, @NotNull final UsergridResponseCallback responseCallback) {
+ UsergridAsync.disconnect(Usergrid.getInstance(),entityType,entityId,relationship,fromUuid,responseCallback);
+ }
+
+ public static void disconnect(@NotNull final UsergridClient client, @NotNull final String entityType, @NotNull final String entityId, @NotNull final String relationship, @NotNull final String fromUuid, @NotNull final UsergridResponseCallback responseCallback) {
+ (new UsergridAsyncTask(responseCallback) {
+ @Override
+ public UsergridResponse doTask() {
+ return client.disconnect(entityType, entityId, relationship, fromUuid);
+ }
+ }).execute();
+ }
+
+ public static void disconnect(@NotNull final String entityType, @NotNull final String entityId, @NotNull final String relationship, @NotNull final String fromType, @NotNull final String fromName, @NotNull final UsergridResponseCallback responseCallback) {
+ UsergridAsync.disconnect(Usergrid.getInstance(),entityType,entityId,relationship,fromType,fromName,responseCallback);
+ }
+
+ public static void disconnect(@NotNull final UsergridClient client, @NotNull final String entityType, @NotNull final String entityId, @NotNull final String relationship, @NotNull final String fromType, @NotNull final String fromName, @NotNull final UsergridResponseCallback responseCallback) {
+ (new UsergridAsyncTask(responseCallback) {
+ @Override
+ public UsergridResponse doTask() {
+ return client.disconnect(entityType, entityId, relationship, fromType, fromName);
+ }
+ }).execute();
+ }
+
+ public static void disconnect(@NotNull final UsergridEntity entity, @NotNull final String relationship, @NotNull final UsergridEntity from, @NotNull final UsergridResponseCallback responseCallback) {
+ UsergridAsync.disconnect(Usergrid.getInstance(),entity,relationship,from,responseCallback);
+ }
+
+ public static void disconnect(@NotNull final UsergridClient client, @NotNull final UsergridEntity entity, @NotNull final String relationship, @NotNull final UsergridEntity from, @NotNull final UsergridResponseCallback responseCallback) {
+ (new UsergridAsyncTask(responseCallback) {
+ @Override
+ public UsergridResponse doTask() {
+ return client.disconnect(entity, relationship, from);
+ }
+ }).execute();
+ }
+
+ public static void getConnections(@NotNull final UsergridDirection direction, @NotNull final UsergridEntity entity, @NotNull final String relationship, @NotNull final UsergridResponseCallback responseCallback) {
+ UsergridAsync.getConnections(Usergrid.getInstance(),direction,entity,relationship,null,responseCallback);
+ }
+
+ public static void getConnections(@NotNull final UsergridClient client, @NotNull final UsergridDirection direction, @NotNull final UsergridEntity entity, @NotNull final String relationship, @NotNull final UsergridResponseCallback responseCallback) {
+ UsergridAsync.getConnections(client,direction,entity,relationship,null,responseCallback);
+ }
+
+ public static void getConnections(@NotNull final UsergridDirection direction, @NotNull final UsergridEntity entity, @NotNull final String relationship, @Nullable final UsergridQuery query, @NotNull final UsergridResponseCallback responseCallback) {
+ UsergridAsync.getConnections(Usergrid.getInstance(),direction,entity,relationship,query,responseCallback);
+ }
+
+ public static void getConnections(@NotNull final UsergridClient client, @NotNull final UsergridDirection direction, @NotNull final UsergridEntity entity, @NotNull final String relationship, @Nullable final UsergridQuery query, @NotNull final UsergridResponseCallback responseCallback) {
+ (new UsergridAsyncTask(responseCallback) {
+ @Override
+ public UsergridResponse doTask() {
+ return client.getConnections(direction, entity, relationship, query);
+ }
+ }).execute();
+ }
+
+ public static void getConnections(@NotNull final UsergridDirection direction, @NotNull final String type, @NotNull final String uuidOrName, @NotNull final String relationship, @Nullable final UsergridQuery query, @NotNull final UsergridResponseCallback responseCallback) {
+ UsergridAsync.getConnections(Usergrid.getInstance(),direction,type,uuidOrName,relationship,query,responseCallback);
+ }
+
+ public static void getConnections(@NotNull final UsergridClient client, @NotNull final UsergridDirection direction, @NotNull final String type, @NotNull final String uuidOrName, @NotNull final String relationship, @Nullable final UsergridQuery query, @NotNull final UsergridResponseCallback responseCallback) {
+ (new UsergridAsyncTask(responseCallback) {
+ @Override
+ public UsergridResponse doTask() {
+ return client.getConnections(direction, type, uuidOrName, relationship, query);
+ }
+ }).execute();
+ }
+
+ public static void getConnections(@NotNull final UsergridDirection direction, @NotNull final String uuid, @NotNull final String relationship, @Nullable final UsergridQuery query, @NotNull final UsergridResponseCallback responseCallback) {
+ UsergridAsync.getConnections(Usergrid.getInstance(),direction,uuid,relationship,query,responseCallback);
+ }
+
+ public static void getConnections(@NotNull final UsergridClient client, @NotNull final UsergridDirection direction, @NotNull final String uuid, @NotNull final String relationship, @Nullable final UsergridQuery query, @NotNull final UsergridResponseCallback responseCallback) {
+ (new UsergridAsyncTask(responseCallback) {
+ @Override
+ public UsergridResponse doTask() {
+ return client.getConnections(direction, uuid, relationship, query);
+ }
+ }).execute();
+ }
+}
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/UsergridAndroidSDK/src/main/java/org/apache/usergrid/android/UsergridEntityAsync.java
----------------------------------------------------------------------
diff --git a/UsergridAndroidSDK/src/main/java/org/apache/usergrid/android/UsergridEntityAsync.java b/UsergridAndroidSDK/src/main/java/org/apache/usergrid/android/UsergridEntityAsync.java
new file mode 100644
index 0000000..690cc0f
--- /dev/null
+++ b/UsergridAndroidSDK/src/main/java/org/apache/usergrid/android/UsergridEntityAsync.java
@@ -0,0 +1,110 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.usergrid.android;
+
+import org.apache.usergrid.android.callbacks.UsergridResponseCallback;
+import org.apache.usergrid.android.tasks.UsergridAsyncTask;
+import org.apache.usergrid.java.client.Usergrid;
+import org.apache.usergrid.java.client.UsergridClient;
+import org.apache.usergrid.java.client.UsergridEnums.UsergridDirection;
+import org.apache.usergrid.java.client.model.UsergridEntity;
+import org.apache.usergrid.java.client.response.UsergridResponse;
+import org.jetbrains.annotations.NotNull;
+
+@SuppressWarnings("unused")
+public final class UsergridEntityAsync {
+
+ private UsergridEntityAsync() {}
+
+ public static void reload(@NotNull final UsergridEntity entity, @NotNull final UsergridResponseCallback responseCallback) {
+ UsergridEntityAsync.reload(Usergrid.getInstance(),entity,responseCallback);
+ }
+
+ public static void reload(@NotNull final UsergridClient client, @NotNull final UsergridEntity entity, @NotNull final UsergridResponseCallback responseCallback) {
+ (new UsergridAsyncTask(responseCallback) {
+ @Override
+ public UsergridResponse doTask() {
+ return entity.reload(client);
+ }
+ }).execute();
+ }
+
+ public static void save(@NotNull final UsergridEntity entity, @NotNull final UsergridResponseCallback responseCallback) {
+ UsergridEntityAsync.save(Usergrid.getInstance(),entity,responseCallback);
+ }
+
+ public static void save(@NotNull final UsergridClient client, @NotNull final UsergridEntity entity, @NotNull final UsergridResponseCallback responseCallback) {
+ (new UsergridAsyncTask(responseCallback) {
+ @Override
+ public UsergridResponse doTask() {
+ return entity.save(client);
+ }
+ }).execute();
+ }
+
+ public static void remove(@NotNull final UsergridEntity entity, @NotNull final UsergridResponseCallback responseCallback) {
+ UsergridEntityAsync.remove(Usergrid.getInstance(),entity, responseCallback);
+ }
+
+ public static void remove(@NotNull final UsergridClient client, @NotNull final UsergridEntity entity, @NotNull final UsergridResponseCallback responseCallback) {
+ (new UsergridAsyncTask(responseCallback) {
+ @Override
+ public UsergridResponse doTask() {
+ return entity.remove(client);
+ }
+ }).execute();
+ }
+
+ public static void connect(@NotNull final UsergridEntity entity, @NotNull final String relationship, @NotNull final UsergridEntity toEntity, @NotNull final UsergridResponseCallback responseCallback) {
+ UsergridEntityAsync.connect(Usergrid.getInstance(), entity, relationship, toEntity, responseCallback);
+ }
+
+ public static void connect(@NotNull final UsergridClient client, @NotNull final UsergridEntity entity, @NotNull final String relationship, @NotNull final UsergridEntity toEntity, @NotNull final UsergridResponseCallback responseCallback) {
+ (new UsergridAsyncTask(responseCallback) {
+ @Override
+ public UsergridResponse doTask() {
+ return entity.connect(client,relationship,toEntity);
+ }
+ }).execute();
+ }
+
+ public static void disconnect(@NotNull final UsergridEntity entity, @NotNull final String relationship, @NotNull final UsergridEntity fromEntity, @NotNull final UsergridResponseCallback responseCallback) {
+ UsergridEntityAsync.disconnect(Usergrid.getInstance(), entity, relationship, fromEntity, responseCallback);
+ }
+
+ public static void disconnect(@NotNull final UsergridClient client, @NotNull final UsergridEntity entity, @NotNull final String relationship, @NotNull final UsergridEntity fromEntity, @NotNull final UsergridResponseCallback responseCallback) {
+ (new UsergridAsyncTask(responseCallback) {
+ @Override
+ public UsergridResponse doTask() {
+ return entity.disconnect(client,relationship,fromEntity);
+ }
+ }).execute();
+ }
+
+ public static void getConnections(@NotNull final UsergridEntity entity, @NotNull final UsergridDirection direction, @NotNull final String relationship, @NotNull final UsergridResponseCallback responseCallback) {
+ UsergridEntityAsync.getConnections(Usergrid.getInstance(),entity,direction,relationship,responseCallback);
+ }
+
+ public static void getConnections(@NotNull final UsergridClient client, @NotNull final UsergridEntity entity, @NotNull final UsergridDirection direction, @NotNull final String relationship, @NotNull final UsergridResponseCallback responseCallback) {
+ (new UsergridAsyncTask(responseCallback) {
+ @Override
+ public UsergridResponse doTask() {
+ return entity.getConnections(client,direction,relationship);
+ }
+ }).execute();
+ }
+}
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/UsergridAndroidSDK/src/main/java/org/apache/usergrid/android/UsergridResponseAsync.java
----------------------------------------------------------------------
diff --git a/UsergridAndroidSDK/src/main/java/org/apache/usergrid/android/UsergridResponseAsync.java b/UsergridAndroidSDK/src/main/java/org/apache/usergrid/android/UsergridResponseAsync.java
new file mode 100644
index 0000000..51c14c4
--- /dev/null
+++ b/UsergridAndroidSDK/src/main/java/org/apache/usergrid/android/UsergridResponseAsync.java
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.usergrid.android;
+
+import org.apache.usergrid.android.callbacks.UsergridResponseCallback;
+import org.apache.usergrid.android.tasks.UsergridAsyncTask;
+
+import org.apache.usergrid.java.client.response.UsergridResponse;
+import org.jetbrains.annotations.NotNull;
+
+@SuppressWarnings("unused")
+public final class UsergridResponseAsync {
+
+ private UsergridResponseAsync() {}
+
+ public static void loadNextPage(@NotNull final UsergridResponse response, @NotNull final UsergridResponseCallback responseCallback) {
+ (new UsergridAsyncTask(responseCallback) {
+ @Override
+ public UsergridResponse doTask() {
+ return response.loadNextPage();
+ }
+ }).execute();
+ }
+}
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/UsergridAndroidSDK/src/main/java/org/apache/usergrid/android/UsergridSharedDevice.java
----------------------------------------------------------------------
diff --git a/UsergridAndroidSDK/src/main/java/org/apache/usergrid/android/UsergridSharedDevice.java b/UsergridAndroidSDK/src/main/java/org/apache/usergrid/android/UsergridSharedDevice.java
new file mode 100644
index 0000000..ee23d2a
--- /dev/null
+++ b/UsergridAndroidSDK/src/main/java/org/apache/usergrid/android/UsergridSharedDevice.java
@@ -0,0 +1,175 @@
+package org.apache.usergrid.android;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.net.wifi.WifiManager;
+import android.os.Build;
+import android.provider.Settings;
+import android.telephony.TelephonyManager;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.TextNode;
+
+import org.apache.usergrid.android.callbacks.UsergridResponseCallback;
+import org.apache.usergrid.java.client.Usergrid;
+import org.apache.usergrid.java.client.UsergridClient;
+import org.apache.usergrid.java.client.UsergridEnums.UsergridHttpMethod;
+import org.apache.usergrid.java.client.UsergridRequest;
+import org.apache.usergrid.java.client.model.UsergridDevice;
+import org.apache.usergrid.java.client.model.UsergridEntity;
+import org.apache.usergrid.java.client.response.UsergridResponse;
+import org.apache.usergrid.java.client.utils.JsonUtils;
+import org.apache.usergrid.java.client.utils.ObjectUtils;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.UUID;
+
+@SuppressWarnings("unused")
+public final class UsergridSharedDevice {
+ @Nullable
+ private static UsergridDevice sharedDevice;
+
+ @NotNull
+ private static final String USERGRID_PREFS_FILE_NAME = "usergrid_prefs.xml";
+ @NotNull
+ private static final String USERGRID_SHARED_DEVICE_KEY = "usergridSharedDevice";
+
+ @NotNull
+ public static UsergridDevice getSharedDevice(@NotNull final Context context) {
+ if (sharedDevice == null) {
+ sharedDevice = UsergridSharedDevice.getStoredSharedDevice(context);
+ if (sharedDevice == null) {
+ String sharedDeviceId = UsergridSharedDevice.getSharedDeviceUUID(context);
+ HashMap<String, JsonNode> map = new HashMap<String, JsonNode>();
+ map.put("uuid", new TextNode(sharedDeviceId));
+ sharedDevice = new UsergridDevice(map);
+ sharedDevice.setModel(Build.MODEL);
+ sharedDevice.setPlatform("android");
+ sharedDevice.setOsVersion(Build.VERSION.RELEASE);
+ }
+ }
+ return sharedDevice;
+ }
+
+ public static void applyPushToken(@NotNull final Context context, @NotNull final String notifier, @NotNull final String token, @NotNull final UsergridResponseCallback responseCallback) {
+ UsergridSharedDevice.applyPushToken(Usergrid.getInstance(), context, notifier, token, responseCallback);
+ }
+
+ public static void applyPushToken(@NotNull final UsergridClient client, @NotNull final Context context, @NotNull final String notifier, @NotNull final String token, @NotNull final UsergridResponseCallback responseCallback) {
+ UsergridSharedDevice.getSharedDevice(context).putProperty(notifier + ".notifier.id", token);
+ UsergridSharedDevice.saveSharedDeviceRemotelyAndToDisk(client, context, responseCallback);
+ }
+
+ public static void save(@NotNull final Context context, @NotNull final UsergridResponseCallback responseCallback) {
+ UsergridSharedDevice.saveSharedDevice(Usergrid.getInstance(), context, responseCallback);
+ }
+
+ public static void save(@NotNull final UsergridClient client, @NotNull final Context context, @NotNull final UsergridResponseCallback responseCallback) {
+ UsergridSharedDevice.saveSharedDevice(client, context, responseCallback);
+ }
+
+ public static void saveSharedDevice(@NotNull final Context context, @NotNull final UsergridResponseCallback responseCallback) {
+ UsergridSharedDevice.saveSharedDeviceRemotelyAndToDisk(Usergrid.getInstance(), context, responseCallback);
+ }
+
+ public static void saveSharedDevice(@NotNull final UsergridClient client, @NotNull final Context context, @NotNull final UsergridResponseCallback responseCallback) {
+ UsergridSharedDevice.saveSharedDeviceRemotelyAndToDisk(client, context, responseCallback);
+ }
+
+ @Nullable
+ private static UsergridDevice getStoredSharedDevice(@NotNull final Context context) {
+ SharedPreferences prefs = context.getSharedPreferences(USERGRID_PREFS_FILE_NAME, Context.MODE_PRIVATE);
+ String deviceString = prefs.getString(USERGRID_SHARED_DEVICE_KEY, null);
+ UsergridDevice storedSharedDevice = null;
+ if (deviceString != null) {
+ try {
+ storedSharedDevice = JsonUtils.mapper.readValue(deviceString, UsergridDevice.class);
+ } catch (IOException ignored) {
+ prefs.edit().remove(USERGRID_SHARED_DEVICE_KEY).commit();
+ }
+ }
+ return storedSharedDevice;
+ }
+
+ private static void saveSharedDeviceToDisk(@NotNull final Context context) {
+ String deviceAsString = UsergridSharedDevice.getSharedDevice(context).toString();
+ SharedPreferences prefs = context.getSharedPreferences(USERGRID_PREFS_FILE_NAME, Context.MODE_PRIVATE);
+ prefs.edit().putString(USERGRID_SHARED_DEVICE_KEY, deviceAsString).commit();
+ }
+
+ private static void saveSharedDeviceRemotelyAndToDisk(@NotNull final UsergridClient client, @NotNull final Context context, @NotNull final UsergridResponseCallback responseCallback) {
+ UsergridDevice sharedDevice = UsergridSharedDevice.getSharedDevice(context);
+ String sharedDeviceUUID = sharedDevice.getUuid() != null ? sharedDevice.getUuid() : sharedDevice.getStringProperty("uuid");
+ UsergridRequest request = new UsergridRequest(UsergridHttpMethod.PUT, UsergridRequest.APPLICATION_JSON_MEDIA_TYPE, client.clientAppUrl(), null, sharedDevice, client.authForRequests(), "devices", sharedDeviceUUID);
+ UsergridAsync.sendRequest(client, request, new UsergridResponseCallback() {
+ @Override
+ public void onResponse(@NotNull UsergridResponse response) {
+ UsergridEntity responseEntity = response.entity();
+ if (response.ok() && responseEntity != null && responseEntity instanceof UsergridDevice) {
+ UsergridSharedDevice.sharedDevice = (UsergridDevice) responseEntity;
+ UsergridSharedDevice.saveSharedDeviceToDisk(context);
+ }
+ responseCallback.onResponse(response);
+ }
+ });
+ }
+
+ @NotNull
+ public static String getSharedDeviceUUID(@NotNull final Context context) {
+ if( sharedDevice != null && sharedDevice.getUuid() != null ) {
+ return sharedDevice.getUuid();
+ }
+
+ String androidId = Settings.Secure.getString(context.getContentResolver(), Settings.Secure.ANDROID_ID);
+ UUID uuid;
+ try {
+ if (!"9774d56d682e549c".equals(androidId)) {
+ uuid = UUID.nameUUIDFromBytes(androidId.getBytes("utf8"));
+ } else {
+ final String deviceId = ((TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE)).getDeviceId();
+ uuid = deviceId != null ? UUID.nameUUIDFromBytes(deviceId.getBytes("utf8")) : generateDeviceUuid(context);
+ }
+ } catch (Exception ignored) {
+ uuid = UUID.randomUUID();
+ }
+ return uuid.toString();
+ }
+
+ private static UUID generateDeviceUuid(Context context) {
+ // Get some of the hardware information
+ String buildParams = Build.BOARD + Build.BRAND + Build.CPU_ABI
+ + Build.DEVICE + Build.DISPLAY + Build.FINGERPRINT + Build.HOST
+ + Build.ID + Build.MANUFACTURER + Build.MODEL + Build.PRODUCT
+ + Build.TAGS + Build.TYPE + Build.USER;
+
+ // Requires READ_PHONE_STATE
+ TelephonyManager tm = (TelephonyManager) context
+ .getSystemService(Context.TELEPHONY_SERVICE);
+
+ // gets the imei (GSM) or MEID/ESN (CDMA)
+ String imei = tm.getDeviceId();
+
+ // gets the android-assigned id
+ String androidId = Settings.Secure.getString(context.getContentResolver(),
+ Settings.Secure.ANDROID_ID);
+
+ // requires ACCESS_WIFI_STATE
+ WifiManager wm = (WifiManager) context
+ .getSystemService(Context.WIFI_SERVICE);
+
+ // gets the MAC address
+ String mac = wm.getConnectionInfo().getMacAddress();
+
+ // if we've got nothing, return a random UUID
+ if (ObjectUtils.isEmpty(imei) && ObjectUtils.isEmpty(androidId) && ObjectUtils.isEmpty(mac)) {
+ return UUID.randomUUID();
+ }
+
+ // concatenate the string
+ String fullHash = buildParams + imei + androidId + mac;
+ return UUID.nameUUIDFromBytes(fullHash.getBytes());
+ }
+}
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/UsergridAndroidSDK/src/main/java/org/apache/usergrid/android/UsergridUserAsync.java
----------------------------------------------------------------------
diff --git a/UsergridAndroidSDK/src/main/java/org/apache/usergrid/android/UsergridUserAsync.java b/UsergridAndroidSDK/src/main/java/org/apache/usergrid/android/UsergridUserAsync.java
new file mode 100644
index 0000000..af0b791
--- /dev/null
+++ b/UsergridAndroidSDK/src/main/java/org/apache/usergrid/android/UsergridUserAsync.java
@@ -0,0 +1,125 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.usergrid.android;
+
+import org.apache.usergrid.android.callbacks.UsergridCheckAvailabilityCallback;
+import org.apache.usergrid.android.callbacks.UsergridResponseCallback;
+import org.apache.usergrid.android.tasks.UsergridAsyncTask;
+
+import org.apache.usergrid.java.client.Usergrid;
+import org.apache.usergrid.java.client.UsergridClient;
+import org.apache.usergrid.java.client.UsergridEnums.*;
+import org.apache.usergrid.java.client.model.UsergridUser;
+import org.apache.usergrid.java.client.query.UsergridQuery;
+import org.apache.usergrid.java.client.response.UsergridResponse;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+@SuppressWarnings("unused")
+public final class UsergridUserAsync {
+
+ private UsergridUserAsync() {}
+
+ public static void checkAvailable(@Nullable final String email, @Nullable final String username, @NotNull final UsergridCheckAvailabilityCallback checkAvailabilityCallback) {
+ UsergridUserAsync.checkAvailable(Usergrid.getInstance(), email, username, checkAvailabilityCallback);
+ }
+
+ public static void checkAvailable(@NotNull final UsergridClient client, @Nullable final String email, @Nullable final String username, @NotNull final UsergridCheckAvailabilityCallback checkAvailabilityCallback) {
+ if (email == null && username == null) {
+ checkAvailabilityCallback.onResponse(false);
+ return;
+ }
+ UsergridQuery query = new UsergridQuery(UsergridUser.USER_ENTITY_TYPE);
+ if (username != null) {
+ query.eq(UsergridUserProperties.USERNAME.toString(), username);
+ }
+ if (email != null) {
+ query.or().eq(UsergridUserProperties.EMAIL.toString(), email);
+ }
+ UsergridAsync.GET(client, query, new UsergridResponseCallback() {
+ @Override
+ public void onResponse(@NotNull UsergridResponse response) {
+ checkAvailabilityCallback.onResponse((response.ok() && response.first() != null));
+ }
+ });
+ }
+
+ public static void create(@NotNull final UsergridUser user, @NotNull final UsergridResponseCallback responseCallback) {
+ UsergridUserAsync.create(Usergrid.getInstance(),user,responseCallback);
+ }
+
+ public static void create(@NotNull final UsergridClient client, @NotNull final UsergridUser user, @NotNull final UsergridResponseCallback responseCallback) {
+ (new UsergridAsyncTask(responseCallback) {
+ @Override
+ public UsergridResponse doTask() {
+ return user.create(client);
+ }
+ }).execute();
+ }
+
+ public static void login(@NotNull final UsergridUser user, @NotNull final String username, @NotNull final String password, @NotNull final UsergridResponseCallback responseCallback) {
+ UsergridUserAsync.login(Usergrid.getInstance(),user,username,password,responseCallback);
+ }
+
+ public static void login(@NotNull final UsergridClient client, @NotNull final UsergridUser user, @NotNull final String username, @NotNull final String password, @NotNull final UsergridResponseCallback responseCallback) {
+ (new UsergridAsyncTask(responseCallback) {
+ @Override
+ public UsergridResponse doTask() {
+ return user.login(client,username,password);
+ }
+ }).execute();
+ }
+
+ public static void resetPassword(@NotNull final UsergridUser user, @NotNull final String oldPassword, @NotNull final String newPassword, @NotNull final UsergridResponseCallback responseCallback) {
+ UsergridUserAsync.resetPassword(Usergrid.getInstance(),user,oldPassword,newPassword,responseCallback);
+ }
+
+ public static void resetPassword(@NotNull final UsergridClient client, @NotNull final UsergridUser user, @NotNull final String oldPassword, @NotNull final String newPassword, @NotNull final UsergridResponseCallback responseCallback) {
+ (new UsergridAsyncTask(responseCallback) {
+ @Override
+ public UsergridResponse doTask() {
+ return user.resetPassword(client,oldPassword,newPassword);
+ }
+ }).execute();
+ }
+
+ public static void reauthenticate(@NotNull final UsergridUser user, @NotNull final UsergridResponseCallback responseCallback) {
+ UsergridUserAsync.reauthenticate(Usergrid.getInstance(),user,responseCallback);
+ }
+
+ public static void reauthenticate(@NotNull final UsergridClient client, @NotNull final UsergridUser user, @NotNull final UsergridResponseCallback responseCallback) {
+ (new UsergridAsyncTask(responseCallback) {
+ @Override
+ public UsergridResponse doTask() {
+ return user.reauthenticate(client);
+ }
+ }).execute();
+ }
+
+ public static void logout(@NotNull final UsergridUser user, @NotNull final UsergridResponseCallback responseCallback) {
+ UsergridUserAsync.logout(Usergrid.getInstance(),user,responseCallback);
+ }
+
+ public static void logout(@NotNull final UsergridClient client, @NotNull final UsergridUser user, @NotNull final UsergridResponseCallback responseCallback) {
+ (new UsergridAsyncTask(responseCallback) {
+ @Override
+ public UsergridResponse doTask() {
+ return user.logout(client);
+ }
+ }).execute();
+ }
+}
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/UsergridAndroidSDK/src/main/java/org/apache/usergrid/android/callbacks/UsergridCheckAvailabilityCallback.java
----------------------------------------------------------------------
diff --git a/UsergridAndroidSDK/src/main/java/org/apache/usergrid/android/callbacks/UsergridCheckAvailabilityCallback.java b/UsergridAndroidSDK/src/main/java/org/apache/usergrid/android/callbacks/UsergridCheckAvailabilityCallback.java
new file mode 100644
index 0000000..3c3916e
--- /dev/null
+++ b/UsergridAndroidSDK/src/main/java/org/apache/usergrid/android/callbacks/UsergridCheckAvailabilityCallback.java
@@ -0,0 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.usergrid.android.callbacks;
+
+public interface UsergridCheckAvailabilityCallback {
+ void onResponse(final boolean available);
+}
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/UsergridAndroidSDK/src/main/java/org/apache/usergrid/android/callbacks/UsergridResponseCallback.java
----------------------------------------------------------------------
diff --git a/UsergridAndroidSDK/src/main/java/org/apache/usergrid/android/callbacks/UsergridResponseCallback.java b/UsergridAndroidSDK/src/main/java/org/apache/usergrid/android/callbacks/UsergridResponseCallback.java
new file mode 100644
index 0000000..fce1e67
--- /dev/null
+++ b/UsergridAndroidSDK/src/main/java/org/apache/usergrid/android/callbacks/UsergridResponseCallback.java
@@ -0,0 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.usergrid.android.callbacks;
+
+import org.apache.usergrid.java.client.response.UsergridResponse;
+import org.jetbrains.annotations.NotNull;
+
+public interface UsergridResponseCallback {
+ void onResponse(@NotNull final UsergridResponse response);
+}
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/UsergridAndroidSDK/src/main/java/org/apache/usergrid/android/tasks/UsergridAsyncTask.java
----------------------------------------------------------------------
diff --git a/UsergridAndroidSDK/src/main/java/org/apache/usergrid/android/tasks/UsergridAsyncTask.java b/UsergridAndroidSDK/src/main/java/org/apache/usergrid/android/tasks/UsergridAsyncTask.java
new file mode 100644
index 0000000..b9dd2c6
--- /dev/null
+++ b/UsergridAndroidSDK/src/main/java/org/apache/usergrid/android/tasks/UsergridAsyncTask.java
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.usergrid.android.tasks;
+
+import android.os.AsyncTask;
+
+import org.apache.usergrid.android.callbacks.UsergridResponseCallback;
+
+import org.apache.usergrid.java.client.response.UsergridResponse;
+import org.jetbrains.annotations.NotNull;
+
+public abstract class UsergridAsyncTask extends AsyncTask<Void, Void, UsergridResponse> {
+
+ @NotNull private final UsergridResponseCallback responseCallback;
+
+ public UsergridAsyncTask(@NotNull final UsergridResponseCallback responseCallback) {
+ this.responseCallback = responseCallback;
+ }
+
+ @Override @NotNull
+ protected UsergridResponse doInBackground(final Void... v) {
+ return doTask();
+ }
+
+ public abstract UsergridResponse doTask();
+
+ @Override
+ protected void onPostExecute(@NotNull final UsergridResponse response) {
+ this.responseCallback.onResponse(response);
+ }
+}
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/UsergridAndroidSDK/src/main/res/values/strings.xml
----------------------------------------------------------------------
diff --git a/UsergridAndroidSDK/src/main/res/values/strings.xml b/UsergridAndroidSDK/src/main/res/values/strings.xml
new file mode 100644
index 0000000..2bb6e0e
--- /dev/null
+++ b/UsergridAndroidSDK/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+ <string name="app_name">UsergridAndroidSDK</string>
+</resources>
[3/3] usergrid-android git commit: Initial commit of Usergrid Android
SDK in its own repo.
Posted by mr...@apache.org.
Initial commit of Usergrid Android SDK in its own repo.
Project: http://git-wip-us.apache.org/repos/asf/usergrid-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid-android/commit/4a794e46
Tree: http://git-wip-us.apache.org/repos/asf/usergrid-android/tree/4a794e46
Diff: http://git-wip-us.apache.org/repos/asf/usergrid-android/diff/4a794e46
Branch: refs/heads/master
Commit: 4a794e46ad54d8255b349cafa0051494e4c16770
Parents:
Author: Michael Russo <mr...@apigee.com>
Authored: Fri Sep 2 10:27:51 2016 -0700
Committer: Michael Russo <mr...@apigee.com>
Committed: Fri Sep 2 10:27:51 2016 -0700
----------------------------------------------------------------------
.gitignore | 3 +
LICENSE | 19 +
README.md | 590 +++++++++++++++++++
Samples/ActivityFeed/.gitignore | 8 +
Samples/ActivityFeed/activityfeed/.gitignore | 1 +
Samples/ActivityFeed/activityfeed/build.gradle | 27 +
Samples/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 +
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 +
Samples/ActivityFeed/gradlew | 160 +++++
Samples/ActivityFeed/gradlew.bat | 90 +++
Samples/ActivityFeed/settings.gradle | 2 +
Samples/Push/.gitignore | 8 +
Samples/Push/build.gradle | 22 +
Samples/Push/gradle.properties | 18 +
Samples/Push/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 53636 bytes
.../gradle/wrapper/gradle-wrapper.properties | 6 +
Samples/Push/gradlew | 160 +++++
Samples/Push/gradlew.bat | 90 +++
Samples/Push/push/.gitignore | 1 +
Samples/Push/push/build.gradle | 27 +
Samples/Push/push/libs/gcm.jar | Bin 0 -> 13662 bytes
Samples/Push/push/proguard-rules.pro | 17 +
.../apache/usergrid/push/ApplicationTest.java | 13 +
Samples/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 +
Samples/Push/settings.gradle | 2 +
UsergridAndroidSDK/.gitignore | 8 +
UsergridAndroidSDK/build.gradle | 70 +++
.../gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 53636 bytes
.../gradle/wrapper/gradle-wrapper.properties | 6 +
UsergridAndroidSDK/gradlew | 160 +++++
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 +
UsergridAndroidSDK/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 +
102 files changed, 4999 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..22ffac4
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+*.iml
+.idea
+target/
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..34193ba
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,19 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. The ASF licenses this file to You
+ * under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License. For additional information regarding
+ * copyright in this work, please see the NOTICE file in the top level
+ * directory of this distribution.
+ *
+ */
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..a45b8d7
--- /dev/null
+++ b/README.md
@@ -0,0 +1,590 @@
+# Usergrid Android SDK
+
+Usergrid SDK written for Android.
+
+The Android SDK is an extension upon the the Usergrid Java SDK with added functionality including asynchronous HTTP handling and push notifications.
+
+## Initialization
+
+There are two different ways of initializing the Usergrid Android SDK:
+
+1. The singleton pattern is both convenient and enables the developer to use a globally available and always-initialized instance of Usergrid.
+
+```java
+Usergrid.initSharedInstance("orgId", "appId");
+```
+
+2. The Instance pattern enables the developer to manage instances of the Usergrid client independently and in an isolated fashion. The primary use-case for this is when an application connects to multiple Usergrid targets.
+
+```java
+UsergridClient client = new UsergridClient("orgId","appId");
+```
+
+_Note: Examples in this readme assume you are using the `Usergrid` shared instance. If you've implemented the instance pattern instead, simply replace `Usergrid` with your client instance variable._
+
+## ASYNCHRONOUS operations
+
+The examples in this readme utilize the synchronous method calls provided by the Usergrid Java SDK.
+
+Each RESTful operation has a matching asynchrous method within to use within the SDK for convience of use within Android applications.
+
+For examples of asynchronous calls, look over the sample Android applications located within the `Samples` folder.
+
+## RESTful operations
+
+When making any RESTful call, a `type` parameter (or `path`) is always required. Whether you specify this as an argument or in an object as a parameter is up to you.
+
+### GET
+
+- To get entities in a collection:
+
+```java
+UsergridResponse response = Usergrid.GET("collection");
+List<UsergridEntity> entities = response.getEntities();
+```
+
+- To get a specific entity in a collection by uuid or name:
+
+```java
+UsergridResponse response = Usergrid.GET("collection","<uuid-or-name>");
+UsergridEntity entities = response.entity();
+```
+
+- To get specific entities in a collection by passing a `UsergridQuery` object:
+
+```java
+UsergridQuery query = new UsergridQuery("cats").gt("weight", 2.4)
+ .contains("color", "bl*")
+ .not()
+ .eq("color", "blue")
+ .or()
+ .eq("color", "orange");
+
+// this will build out the following query:
+// select * where weight > 2.4 and color contains 'bl*' and not color = 'blue' or color = 'orange'
+
+UsergridResponse response = Usergrid.GET(query);
+List<UsergridEntity> entities = response.getEntities();
+```
+
+### POST and PUT
+
+POST and PUT requests both require a JSON body payload. You can pass either a Java object or a `UsergridEntity` instance. While the former works in principle, best practise is to use a `UsergridEntity` wherever practical. When an entity has a uuid or name property and already exists on the server, use a PUT request to update it. If it does not, use POST to create it.
+
+- To create a new entity in a collection (**POST**):
+
+```java
+HashMap<String,String> propertyMap = new HashMap<>();
+propertyMap.put("cuisine","pizza");
+UsergridEntity entity = new UsergridEntity("restaurant","Dino's Deep Dish", propertyMap);
+Usergrid.POST(entity); // entity should now have a uuid property and be created
+
+// you can also POST an array of entities:
+
+HashMap<String,String> propertyMap = new HashMap<>();
+propertyMap.put("cuisine","pizza");
+
+ArrayList<UsergridEntity> entities = new ArrayList<>();
+entities.add(new UsergridEntity("restaurant","Dino's Deep Dish", propertyMap));
+entities.add(new UsergridEntity("restaurant","Pizza da Napoli", propertyMap));
+UsergridResponse response = Usergrid.POST(entities);
+List<UsergridEntity> responseEntities = response.getEntities(); // responseEntities should now contain now valid posted entities.
+```
+
+- To update an entity in a collection (**PUT**):
+
+```java
+HashMap<String,String> propertyMap = new HashMap<>();
+propertyMap.put("cuisine","pizza");
+UsergridEntity entity = new UsergridEntity("restaurant","Dino's Deep Dish", propertyMap);
+UsergridResponse response = Usergrid.POST(entity);
+if( response.ok() ) {
+ entity.putProperty("owner","Mia Carrara");
+ Usergrid.PUT(entity); // entity now has the property 'owner'
+}
+
+// or update a set of entities by passing a UsergridQuery object
+
+HashMap<String,String> propertiesToUpdate = new HashMap<>();
+propertiesToUpdate.put("cuisine","pizza");
+UsergridQuery query = new UsergridQuery("restaurants").eq("cuisine","italian");
+
+UsergridResponse response = Usergrid.PUT(query, propertiesToUpdate);
+
+ /* the first 10 entities matching this query criteria will be updated:
+ e.g.:
+ [
+ {
+ "type": "restaurant",
+ "restaurant": "Il Tarazzo",
+ "cuisine": "italian",
+ "keywords": ["pasta"]
+ },
+ {
+ "type": "restaurant",
+ "restaurant": "Cono Sur Pizza & Pasta",
+ "cuisine": "italian",
+ "keywords": ["pasta"]
+ }
+ ]
+ */
+```
+
+### DELETE
+
+DELETE requests require either a specific entity or a `UsergridQuery` object to be passed as an argument.
+
+- To delete a specific entity in a collection by uuid or name:
+
+```java
+UsergridResponse response = Usergrid.DELETE("collection", "<uuid-or-name>"); // if successful, entity will now be deleted
+```
+
+- To specific entities in a collection to delete by passing a `UsergridQuery` object:
+
+```java
+UsergridQuery query = new UsergridQuery("cats").eq("color","black").or().eq("color","white");
+
+// this will build out the following query:
+// select * where color = 'black' or color = 'white'
+
+UsergridResponse response = Usergrid.DELETE(query); // the first 10 entities matching this query criteria will be deleted
+```
+
+## Entity operations and convenience methods
+
+`UsergridEntity` has a number of helper/convenience methods to make working with entities more convenient.
+
+### reload()
+
+Reloads the entity from the server:
+
+```java
+entity.reload(); // entity is now reloaded from the server
+```
+
+### save()
+
+Saves (or creates) the entity on the server:
+
+
+```java
+entity.putProperty("aNewProperty","A new value");
+entity.save(); // entity is now updated on the server
+```
+
+### remove()
+
+Deletes the entity from the server:
+
+```java
+entity.remove(); // entity is now deleted on the server and the local instance should be destroyed
+```
+
+## Authentication, current user, and auth-fallback
+
+### appAuth and authenticateApp()
+
+`Usergrid` can use the app client ID and secret that were passed upon initialization and automatically retrieve an app-level token for these credentials.
+
+```java
+Usergrid.setAppAuth(new UsergridAppAuth("<client-id>", "<client-secret>"));
+Usergrid.authenticateApp(); // Usergrid.appAuth is authenticated automatically when this call is successful
+```
+
+### currentUser, userAuth, and authenticateUser()
+
+`Usergrid` has a special `currentUser` property.
+
+By default, when calling `authenticateUser()`, `.currentUser` will be set to this user if the authentication flow is successful.
+
+```java
+UsergridUserAuth userAuth = new UsergridUserAuth("<username>","<password>");
+Usergrid.authenticateUser(userAuth); // Usergrid.currentUser is set to the authenticated user and the token is stored within that context
+```
+
+If you want to utilize authenticateUser without setting as the current user, simply pass a `false` boolean value as the second parameter:
+
+```java
+UsergridUserAuth userAuth = new UsergridUserAuth("<username>","<password>");
+Usergrid.authenticateUser(userAuth,false); // user is authenticated but Usergrid.currentUser is not set.
+```
+
+### authMode
+
+Auth-mode defines what the client should pass in for the authorization header.
+
+By default, `Usergrid.authMode` is set to `.User`, when a `Usergrid.currentUser` is present and authenticated, an API call will be performed using the token for the user.
+
+If `Usergrid.authMode` is set to `.None`, all API calls will be performed unauthenticated.
+
+If instead `Usergrid.authMode` is set to `.App`, the API call will instead be performed using client credentials, _if_ they're available (i.e. `authenticateApp()` was performed at some point).
+
+### usingAuth()
+
+At times it is desireable to have complete, granular control over the authentication context of an API call.
+
+To facilitate this, the passthrough function `.usingAuth()` allows you to pre-define the auth context of the next API call.
+
+```java
+// assume Usergrid.authMode = UsergridAuthMode.NONE.
+
+Map<String, String> permissionsMap = new HashMap<>();
+permissionsMap.put("permission","get,post,put,delete:/**");
+UsergridResponse response = Usergrid.usingAuth(Usergrid.getAppAuth()).POST("roles/guest/permissions",permissionsMap);
+
+// here we've temporarily used the client credentials to modify permissions
+// subsequent calls will not use this auth context
+```
+
+## User operations and convenience methods
+
+`UsergridUser` has a number of helper/convenience methods to make working with user entities more convenient. If you are _not_ utilizing the `Usergrid` shared instance, you must pass an instance of `UsergridClient` as the first argument to any of these helper methods.
+
+### create()
+
+Creating a new user:
+
+```java
+UsergridUser user = new UsergridUser("username","password");
+user.create(); // user has now been created and should have a valid uuid
+```
+
+### login()
+
+A simpler means of retrieving a user-level token:
+
+```java
+user.login("username","password"); // user is now logged in
+```
+
+### logout()
+
+Logs out the selected user. You can also use this convenience method on `Usergrid.currentUser`.
+
+```java
+user.logout(); // user is now logged out
+```
+
+### resetPassword()
+
+Resets the password for the selected user.
+
+```java
+// if it was done correctly, the new password will be changed
+user.resetPassword("oldPassword", "newPassword");
+```
+
+### UsergridUser.CheckAvailable()
+
+This is a class (static) method that allows you to check whether a username or email address is available or not.
+
+```java
+boolean available = UsergridUser.checkAvailable("email", null); // 'available' == whether an email already exists for a user
+
+available = UsergridUser.checkAvailable(null, "username"); // 'available' == whether an username already exists for a user
+
+available = UsergridUser.checkAvailable("email", "username"); // 'available' == whether an email or username already exist for a user
+```
+
+## Querying and filtering data
+
+### UsergridQuery initialization
+
+The `UsergridQuery` class allows you to build out complex query filters using the Usergrid [query syntax](http://docs.apigee.com/app-services/content/querying-your-data).
+
+The first parameter of the `UsergridQuery` builder pattern should be the collection (or type) you intend to query. You can either pass this as an argument, or as the first builder object:
+
+```java
+UsergridQuery query = new UsergridQuery("cats");
+// or
+UsergridQuery query = new UsergridQuery().collection("cats");
+```
+
+You then can layer on additional queries:
+
+```java
+UsergridQuery query = new UsergridQuery("cats").gt("weight",2.4).contains("color","bl*")
+ .not()
+ .eq("color","white")
+ .or()
+ .eq("color","orange");
+```
+
+You can also adjust the number of results returned:
+
+```java
+UsergridQuery query = new UsergridQuery("cats").eq("color","black").limit(100);
+
+// returns a maximum of 100 entities
+```
+
+And sort the results:
+
+```java
+UsergridQuery query = new UsergridQuery("cats").eq("color","black").limit(100).asc("name")
+
+// sorts by 'name', ascending
+```
+
+And you can do geo-location queries:
+
+```java
+UsergridQuery query = new UsergridQuery("devices").locationWithin(<distance>, <lat>, <long>);
+```
+
+### Using a query in a request
+
+Queries can be passed as parameters to GET, PUT, and DELETE requests:
+
+```java
+// Gets entities matching the query.
+Usergrid.GET(query);
+
+// Updates the entities matching the query with the new property.
+Usergrid.PUT(query, Collections.singletonMap("aNewProperty","A new value"));
+
+// Deletes entities of a given type matching the query.
+Usergrid.DELETE(query);
+```
+### List of query builder objects
+
+`type("string")`
+
+> The collection name to query
+
+`collection("string")`
+
+> An alias for `type`
+
+`eq("key","value")` or
+`equals("key","value")` or
+`filter("key","value")`
+
+> Equal to (e.g. `where color = 'black'`)
+
+`contains("key","value")` or
+`containsString("key","value")` or
+`containsWord("key","value")`
+
+> Contains a string (e.g.` where color contains 'bl*'`)
+
+`gt("key","value")` or
+`greaterThan("key","value")`
+
+> Greater than (e.g. `where weight > 2.4`)
+
+`gte("key","value")` or
+`greaterThanOrEqual("key","value")`
+
+> Greater than or equal to (e.g. `where weight >= 2.4`)
+
+`lt("key","value")` or `lessThan("key","value")`
+
+> Less than (e.g. `where weight < 2.4`)
+
+`lte("key","value")` or `lessThanOrEqual("key","value")`
+
+> Less than or equal to (e.g. `where weight <= 2.4`)
+
+`not()`
+
+> Negates the next block in the builder pattern, e.g.:
+
+```java
+UsergridQuery query = new UsergridQuery("cats").not().eq("color","black");
+// select * from cats where not color = 'black'
+```
+
+`and()`
+
+> Joins two queries by requiring both of them. `and` is also implied when joining two queries _without_ an operator. E.g.:
+
+```java
+UsergridQuery query = new UsergridQuery("cats").eq("color","black").eq("fur","longHair");
+// is identical to:
+UsergridQuery query = new UsergridQuery("cats").eq("color","black").and().eq("fur","longHair");
+```
+
+`or()`
+
+> Joins two queries by requiring only one of them. `or` is never implied. e.g.:
+
+```java
+UsergridQuery query = new UsergridQuery("cats").eq("color","black").or().eq("color", "white");
+```
+
+> When using `or()` and `and()` operators, `and()` joins will take precedence over `or()` joins. You can read more about query operators and precedence [here](http://docs.apigee.com/api-baas/content/supported-query-operators-data-types).
+
+`locationWithin(distanceInMeters, latitude, longitude)`
+
+> Returns entities which have a location within the specified radius. Arguments can be `float` or `int`.
+
+`asc("key")` or `ascending("key")`
+
+> Sorts the results by the specified property, ascending
+
+`desc("key")` or `descending("key")`
+
+> Sorts the results by the specified property, descending
+
+`sort("key",UsergridQuerySortOrder.ASC)`
+
+> Sorts the results by the specified property, in the specified `UsergridQuerySortOrder` (`.ASC` or `.DESC`).
+
+`limit(int)`
+
+> The maximum number of entities to return
+
+`cursor("string")`
+
+> A pagination cursor string
+
+`fromString("query string")`
+
+> A special builder property that allows you to input a pre-defined query string. All builder properties will be ignored when this property is defined. For example:
+
+```java
+UsergridQuery query = new UsergridQuery().fromString("select * where color = 'black' order by name asc");
+```
+
+## UsergridResponse object
+
+`UsergridResponse` is the core class that handles both successful and unsuccessful HTTP responses from Usergrid.
+
+If a request is successful, any entities returned in the response will be automatically parsed into `UsergridEntity` objects and pushed to the `entities` property.
+
+If a request fails, the `error` property will contain information about the problem encountered.
+
+### ok
+
+You can check `UsergridResponse.ok`, a `Bool` value, to see if the response was successful. Any status code `< 400` returns true.
+
+```java
+UsergridResponse response = Usergrid.GET("collection");
+if( response.ok() ) {
+ // woo!
+}
+```
+
+### entity, entities, user, users, first, last
+
+Depending on the call you make, any entities returned in the response will be automatically parsed into `UsergridEntity` objects and pushed to the `entities` property. If you're querying the `users` collection, these will also be `UsergridUser` objects, a subclass of `UsergridEntity`.
+
+- `.first()` returns the first entity in an array of entities; `.entity()` is an alias to `.first()`. If there are no entities, both of these will be undefined.
+
+- `.last()` returns the last entity in an array of entities; if there is only one entity in the array, this will be the same as `.first()` _and_ `.entity()`, and will be undefined if there are no entities in the response.
+
+- `.getEntities()` will either be an array of entities in the response, or an empty array.
+
+- `.user()` is a special alias for `.entity()` for when querying the `users()` collection. Instead of being a `UsergridEntity`, it will be its subclass, `UsergridUser`.
+
+- `.users()` is the same as `.user()`, though behaves as `.getEntities()` does by returning either an array of UsergridUser objects or an empty array.
+
+Examples:
+
+```java
+UsergridResponse response = Usergrid.GET("collection");
+ // you can access:
+ // response.getEntities() (the returned entities)
+ // response.first() (the first entity)
+ // response.entity() (same as response.first)
+ // response.last() (the last entity returned)
+
+UsergridResponse response = Usergrid.GET("collection","<uuid-or-name>");
+ // you can access:
+ // response.entity() (the returned entity)
+ // response.getEntities() (containing only the returned entity)
+ // response.first() (same as response.entity)
+ // response.last() (same as response.entity)
+
+UsergridResponse response = Usergrid.GET("users");
+ // you can access:
+ // response.users() (the returned users)
+ // response.getEntities() (same as response.users)
+ // response.user() (the first user)
+ // response.entity() (same as response.user)
+ // response.first() (same as response.user)
+ // response.last() (the last user)
+
+UsergridResponse response = Usergrid.GET("users","<uuid-or-name>");
+ // you can access;
+ // response.users() (containing only the one user)
+ // response.getEntities() (same as response.users)
+ // response.user() (the returned user)
+ // response.entity() (same as response.user)
+ // response.first() (same as response.user)
+ // response.last() (same as response.user)
+```
+
+## Connections
+
+Connections can be managed using `Usergrid.connect()`, `Usergrid.disconnect()`, and `Usergrid.getConnections()`, or entity convenience methods of the same name.
+
+When retrieving connections via `Usergrid.getConnections()`, you can pass in a optional `UsergridQuery` object in order to filter the connectioned entities returned.
+
+### Connect
+
+Create a connection between two entities:
+
+```java
+Usergrid.connect(entity1, "relationship", entity2); // entity1 now has an outbound connection to entity2
+```
+
+### Retrieve Connections
+
+Retrieve outbound connections:
+
+```java
+Usergrid.getConnections(UsergridDirection.OUT, entity1, "relationship");
+ // entities is an array of entities that entity1 is connected to via 'relationship'
+ // in this case, we'll see entity2 in the array
+```
+
+Retrieve inbound connections:
+
+```java
+Usergrid.getConnections(UsergridDirection.IN, entity2, "relationship");
+ // entities is an array of entities that connect to entity2 via 'relationship'
+ // in this case, we'll see entity1 in the array
+```
+
+### Disconnect
+
+Delete a connection between two entities:
+
+```java
+Usergrid.disconnect(entity1, "relationship", entity2);
+ // entity1's outbound connection to entity2 has been destroyed
+```
+
+## Custom UsergridEntity Subclasses
+
+Creating custom subclasses of the base `UsergridEntity` class (just like `UsergridUser` and `UsergridDevice`) is possible.
+
+- To do so, subclass `UsergridEntity` and implement the required methods:
+
+```java
+public class ActivityEntity extends UsergridEntity {
+ public static final String ACTIVITY_ENTITY_TYPE = "activity";
+
+ public ActivityEntity(){
+ super(ACTIVITY_ENTITY_TYPE);
+ }
+}
+```
+- You will also need to register the custom subclass:
+
+```java
+Usergrid.initSharedInstance("orgId","appId");
+UsergridEntity.mapCustomSubclassToType("activity", ActivityEntity.class);
+```
+
+By registering your custom subclass, the `UsergridEntity` and `UsergridResponse` classes are able to generate instances of these classes based on the an entities `type`.
+
+In the above example, entities which have a `type` value of `activity` can now be cast as `ActivityEntity` objects. e.g.:
+
+```java
+UsergridResponse response = Usergrid.GET("activity");
+ActivityEntity activityEntity = (ActivityEntity)response.entity();
+```
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/ActivityFeed/.gitignore
----------------------------------------------------------------------
diff --git a/Samples/ActivityFeed/.gitignore b/Samples/ActivityFeed/.gitignore
new file mode 100644
index 0000000..c6cbe56
--- /dev/null
+++ b/Samples/ActivityFeed/.gitignore
@@ -0,0 +1,8 @@
+*.iml
+.gradle
+/local.properties
+/.idea/workspace.xml
+/.idea/libraries
+.DS_Store
+/build
+/captures
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/ActivityFeed/activityfeed/.gitignore
----------------------------------------------------------------------
diff --git a/Samples/ActivityFeed/activityfeed/.gitignore b/Samples/ActivityFeed/activityfeed/.gitignore
new file mode 100644
index 0000000..796b96d
--- /dev/null
+++ b/Samples/ActivityFeed/activityfeed/.gitignore
@@ -0,0 +1 @@
+/build
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/ActivityFeed/activityfeed/build.gradle
----------------------------------------------------------------------
diff --git a/Samples/ActivityFeed/activityfeed/build.gradle b/Samples/ActivityFeed/activityfeed/build.gradle
new file mode 100644
index 0000000..91d4c7e
--- /dev/null
+++ b/Samples/ActivityFeed/activityfeed/build.gradle
@@ -0,0 +1,27 @@
+apply plugin: 'com.android.application'
+
+android {
+ compileSdkVersion 23
+ buildToolsVersion "22.0.1"
+
+ defaultConfig {
+ applicationId "org.apache.usergrid.activityfeed"
+ minSdkVersion 17
+ targetSdkVersion 23
+ versionCode 1
+ versionName "1.0"
+ }
+ buildTypes {
+ release {
+ minifyEnabled false
+ proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+ }
+ }
+}
+
+dependencies {
+ compile fileTree(include: ['*.jar'], dir: 'libs')
+ testCompile 'junit:junit:4.12'
+ compile 'com.android.support:appcompat-v7:23.3.0'
+ compile project(':UsergridAndroidSDK')
+}
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/ActivityFeed/activityfeed/libs/gcm.jar
----------------------------------------------------------------------
diff --git a/Samples/ActivityFeed/activityfeed/libs/gcm.jar b/Samples/ActivityFeed/activityfeed/libs/gcm.jar
new file mode 100755
index 0000000..ac109a8
Binary files /dev/null and b/Samples/ActivityFeed/activityfeed/libs/gcm.jar differ
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/ActivityFeed/activityfeed/proguard-rules.pro
----------------------------------------------------------------------
diff --git a/Samples/ActivityFeed/activityfeed/proguard-rules.pro b/Samples/ActivityFeed/activityfeed/proguard-rules.pro
new file mode 100644
index 0000000..73ed137
--- /dev/null
+++ b/Samples/ActivityFeed/activityfeed/proguard-rules.pro
@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in /Users/ApigeeCorporation/Developer/android_sdk_files/sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+# http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+# public *;
+#}
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/ActivityFeed/activityfeed/src/androidTest/java/org/apache/usergrid/activityfeed/ApplicationTest.java
----------------------------------------------------------------------
diff --git a/Samples/ActivityFeed/activityfeed/src/androidTest/java/org/apache/usergrid/activityfeed/ApplicationTest.java b/Samples/ActivityFeed/activityfeed/src/androidTest/java/org/apache/usergrid/activityfeed/ApplicationTest.java
new file mode 100644
index 0000000..b376e2f
--- /dev/null
+++ b/Samples/ActivityFeed/activityfeed/src/androidTest/java/org/apache/usergrid/activityfeed/ApplicationTest.java
@@ -0,0 +1,13 @@
+package org.apache.usergrid.activityfeed;
+
+import android.app.Application;
+import android.test.ApplicationTestCase;
+
+/**
+ * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
+ */
+public class ApplicationTest extends ApplicationTestCase<Application> {
+ public ApplicationTest() {
+ super(Application.class);
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/ActivityFeed/activityfeed/src/main/AndroidManifest.xml
----------------------------------------------------------------------
diff --git a/Samples/ActivityFeed/activityfeed/src/main/AndroidManifest.xml b/Samples/ActivityFeed/activityfeed/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..ec275c8
--- /dev/null
+++ b/Samples/ActivityFeed/activityfeed/src/main/AndroidManifest.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="org.apache.usergrid.activityfeed">
+
+ <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
+ <uses-permission android:name="android.permission.GET_ACCOUNTS" />
+ <uses-permission android:name="android.permission.WAKE_LOCK" />
+
+ <permission
+ android:name="org.apache.usergrid.activityfeed.gcm.permission.C2D_MESSAGE"
+ android:protectionLevel="signature" />
+
+ <uses-permission android:name="org.apache.usergrid.activityfeed.gcm.permission.C2D_MESSAGE" />
+
+ <application
+ android:allowBackup="true"
+ android:icon="@mipmap/ic_launcher"
+ android:label="@string/app_name"
+ android:supportsRtl="true"
+ android:theme="@style/AppTheme">
+
+ <receiver
+ android:name="com.google.android.gcm.GCMBroadcastReceiver"
+ android:permission="com.google.android.c2dm.permission.SEND" >
+ <intent-filter>
+ <action android:name="com.google.android.c2dm.intent.RECEIVE" />
+ <action android:name="com.google.android.c2dm.intent.REGISTRATION" />
+
+ <category android:name="org.apache.usergrid.activityfeed" />
+ </intent-filter>
+ </receiver>
+ <service android:name=".GCMIntentService" />
+
+ <activity
+ android:name=".activities.MainActivity"
+ android:label="">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+
+ <category android:name="android.intent.category.LAUNCHER" />
+ </intent-filter>
+ </activity>
+ <activity
+ android:name=".activities.CreateAccountActivity"
+ android:label=""> </activity>
+ <activity
+ android:name=".activities.FeedActivity"
+ android:windowSoftInputMode="stateHidden"
+ android:label=""> </activity>
+ <activity android:name=".activities.FollowActivity"> </activity>
+ </application>
+
+</manifest>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/ActivityFeed/activityfeed/src/main/java/org/apache/usergrid/activityfeed/ActivityEntity.java
----------------------------------------------------------------------
diff --git a/Samples/ActivityFeed/activityfeed/src/main/java/org/apache/usergrid/activityfeed/ActivityEntity.java b/Samples/ActivityFeed/activityfeed/src/main/java/org/apache/usergrid/activityfeed/ActivityEntity.java
new file mode 100644
index 0000000..4c19085
--- /dev/null
+++ b/Samples/ActivityFeed/activityfeed/src/main/java/org/apache/usergrid/activityfeed/ActivityEntity.java
@@ -0,0 +1,86 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.usergrid.activityfeed;
+
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.JsonNode;
+
+import org.apache.usergrid.java.client.model.UsergridEntity;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.HashMap;
+
+@SuppressWarnings("unused")
+public class ActivityEntity extends UsergridEntity {
+
+ public static final String ACTIVITY_ENTITY_TYPE = "activity";
+
+ private String content;
+ private JsonNode actor;
+
+ @Nullable @JsonIgnore
+ public String getDisplayName() {
+ if( actor != null ) {
+ JsonNode displayName = actor.get("displayName");
+ if( displayName != null ) {
+ return displayName.asText();
+ }
+ }
+ return null;
+ }
+
+ @Nullable public String getContent() { return this.content; }
+ public void setContent(@NonNull String content) {
+ this.content = content;
+ }
+
+ @Nullable public JsonNode getActor() { return this.actor; }
+ public void setActor(@NonNull JsonNode actor) {
+ this.actor = actor;
+ }
+
+ public ActivityEntity() {
+ super(ACTIVITY_ENTITY_TYPE);
+ }
+
+ public ActivityEntity(@JsonProperty("type") @NotNull String type) {
+ super(type);
+ }
+
+ public ActivityEntity(@NonNull final String displayName, @NonNull final String email, @Nullable final String picture, @NonNull final String content) {
+ super(ACTIVITY_ENTITY_TYPE);
+ HashMap<String,Object> actorMap = new HashMap<>();
+ actorMap.put("displayName",displayName);
+ actorMap.put("email",email);
+ if( picture != null ) {
+ HashMap<String,Object> imageMap = new HashMap<>();
+ imageMap.put("url",picture);
+ imageMap.put("height",80);
+ imageMap.put("width",80);
+ actorMap.put("image",imageMap);
+ }
+ HashMap<String,Object> activityMap = new HashMap<>();
+ activityMap.put("verb","post");
+ activityMap.put("actor",actorMap);
+ activityMap.put("content",content);
+ this.putProperties(activityMap);
+ }
+}
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/ActivityFeed/activityfeed/src/main/java/org/apache/usergrid/activityfeed/GCMIntentService.java
----------------------------------------------------------------------
diff --git a/Samples/ActivityFeed/activityfeed/src/main/java/org/apache/usergrid/activityfeed/GCMIntentService.java b/Samples/ActivityFeed/activityfeed/src/main/java/org/apache/usergrid/activityfeed/GCMIntentService.java
new file mode 100644
index 0000000..36cb9f1
--- /dev/null
+++ b/Samples/ActivityFeed/activityfeed/src/main/java/org/apache/usergrid/activityfeed/GCMIntentService.java
@@ -0,0 +1,87 @@
+package org.apache.usergrid.activityfeed;
+
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.Intent;
+import android.support.v4.app.NotificationCompat;
+import android.util.Log;
+
+import com.google.android.gcm.GCMBaseIntentService;
+
+import org.apache.usergrid.activityfeed.activities.MainActivity;
+
+public class GCMIntentService extends GCMBaseIntentService {
+
+ public GCMIntentService() {
+ super(UsergridManager.GCM_SENDER_ID);
+ }
+
+ @Override
+ protected void onRegistered(Context context, String registrationId) {
+ Log.i(TAG, "Device registered: " + registrationId);
+ UsergridManager.registerPush(context,registrationId);
+ }
+
+ @Override
+ protected void onUnregistered(Context context, String registrationId) {
+ Log.i(TAG, "Device unregistered");
+ }
+
+ @Override
+ protected void onMessage(Context context, Intent intent) {
+ String message = intent.getExtras().getString("data");
+ Log.i(TAG, "Received message: " + message);
+ generateNotification(context, message);
+ }
+
+ @Override
+ protected void onDeletedMessages(Context context, int total) {
+ Log.i(TAG, "Received deleted messages notification");
+ String message = "GCM server deleted " + total +" pending messages!";
+ generateNotification(context, message);
+ }
+
+ @Override
+ public void onError(Context context, String errorId) {
+ Log.i(TAG, "Received error: " + errorId);
+ }
+
+ @Override
+ protected boolean onRecoverableError(Context context, String errorId) {
+ Log.i(TAG, "Received recoverable error: " + errorId);
+ return super.onRecoverableError(context, errorId);
+ }
+
+ /**
+ * Issues a Notification to inform the user that server has sent a message.
+ */
+ private static void generateNotification(Context context, String message) {
+ long when = System.currentTimeMillis();
+ NotificationManager notificationManager = (NotificationManager)
+ context.getSystemService(Context.NOTIFICATION_SERVICE);
+
+ Intent notificationIntent = new Intent(context, MainActivity.class);
+ // set intent so it does not start a new activity
+ notificationIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
+ PendingIntent intent = PendingIntent.getActivity(context, 0, notificationIntent, 0);
+
+ Notification notification = new NotificationCompat.Builder(context)
+ .setContentText(message)
+ .setContentTitle(context.getString(R.string.app_name))
+ .setWhen(when)
+ .setSmallIcon(R.drawable.usergridguy)
+ .setContentIntent(intent)
+ .build();
+
+ notification.flags |= Notification.FLAG_AUTO_CANCEL;
+
+ // Play default notification sound
+ notification.defaults |= Notification.DEFAULT_SOUND;
+
+ // Vibrate if vibrate is enabled
+ notification.defaults |= Notification.DEFAULT_VIBRATE;
+ notificationManager.notify(0, notification);
+ }
+}
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/ActivityFeed/activityfeed/src/main/java/org/apache/usergrid/activityfeed/UsergridManager.java
----------------------------------------------------------------------
diff --git a/Samples/ActivityFeed/activityfeed/src/main/java/org/apache/usergrid/activityfeed/UsergridManager.java b/Samples/ActivityFeed/activityfeed/src/main/java/org/apache/usergrid/activityfeed/UsergridManager.java
new file mode 100644
index 0000000..b201631
--- /dev/null
+++ b/Samples/ActivityFeed/activityfeed/src/main/java/org/apache/usergrid/activityfeed/UsergridManager.java
@@ -0,0 +1,259 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.usergrid.activityfeed;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.support.annotation.NonNull;
+import android.util.Log;
+
+import com.google.android.gcm.GCMRegistrar;
+
+import org.apache.usergrid.activityfeed.activities.FeedActivity;
+import org.apache.usergrid.activityfeed.callbacks.GetFeedMessagesCallback;
+import org.apache.usergrid.activityfeed.callbacks.PostFeedMessageCallback;
+import org.apache.usergrid.activityfeed.helpers.AlertDialogHelpers;
+import org.apache.usergrid.android.UsergridAsync;
+import org.apache.usergrid.android.UsergridSharedDevice;
+import org.apache.usergrid.android.UsergridUserAsync;
+import org.apache.usergrid.android.callbacks.UsergridResponseCallback;
+import org.apache.usergrid.java.client.Usergrid;
+import org.apache.usergrid.java.client.UsergridEnums;
+import org.apache.usergrid.java.client.UsergridRequest;
+import org.apache.usergrid.java.client.auth.UsergridUserAuth;
+import org.apache.usergrid.java.client.model.UsergridEntity;
+import org.apache.usergrid.java.client.model.UsergridUser;
+import org.apache.usergrid.java.client.query.UsergridQuery;
+import org.apache.usergrid.java.client.response.UsergridResponse;
+import org.apache.usergrid.java.client.response.UsergridResponseError;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+
+public final class UsergridManager {
+
+ private static final String ORG_ID = "rwalsh";
+ private static final String APP_ID = "sandbox";
+ private static final String BASE_URL = "https://api.usergrid.com";
+ private static final String ANDROID_NOTIFIER_ID = "androidPushNotifier";
+
+ public static String GCM_SENDER_ID = "186455511595";
+ public static String GCM_REGISTRATION_ID = "";
+
+ private UsergridManager() {}
+
+ public static void initializeSharedInstance(@NonNull final Context context) {
+ Usergrid.initSharedInstance(ORG_ID,APP_ID,BASE_URL);
+ Usergrid.setAuthMode(UsergridEnums.UsergridAuthMode.USER);
+ UsergridEntity.mapCustomSubclassToType(ActivityEntity.ACTIVITY_ENTITY_TYPE,ActivityEntity.class);
+ UsergridSharedDevice.saveSharedDevice(context, new UsergridResponseCallback() {
+ @Override
+ public void onResponse(@NotNull UsergridResponse response) { }
+ });
+ registerPush(context);
+ }
+
+ public static void registerPush(Context context) {
+ final String regId = GCMRegistrar.getRegistrationId(context);
+ if ("".equals(regId)) {
+ GCMRegistrar.register(context, GCM_SENDER_ID);
+ } else {
+ if (GCMRegistrar.isRegisteredOnServer(context)) {
+ Log.i("", "Already registered with GCM");
+ } else {
+ registerPush(context, regId);
+ }
+ }
+ }
+
+ public static void registerPush(@NonNull final Context context, @NonNull final String registrationId) {
+ GCM_REGISTRATION_ID = registrationId;
+ UsergridAsync.applyPushToken(context, registrationId, ANDROID_NOTIFIER_ID, new UsergridResponseCallback() {
+ @Override
+ public void onResponse(@NonNull UsergridResponse response) {
+ if( !response.ok() && response.getResponseError() != null ) {
+ System.out.print("Error Description :" + response.getResponseError().toString());
+ }
+ }
+ });
+ }
+
+ public static void loginUser(@NonNull final Activity activity, @NonNull final String username, @NonNull final String password) {
+ UsergridAsync.authenticateUser(new UsergridUserAuth(username,password), new UsergridResponseCallback() {
+ @Override
+ public void onResponse(@NotNull final UsergridResponse response) {
+ final UsergridUser currentUser = Usergrid.getCurrentUser();
+ if( response.ok() && currentUser != null ) {
+ UsergridAsync.connect("users", "me", "devices", UsergridSharedDevice.getSharedDeviceUUID(activity), new UsergridResponseCallback() {
+ @Override
+ public void onResponse(@NotNull UsergridResponse response) {
+ AlertDialogHelpers.showScrollableAlert(activity,"Authenticate User Successful","User Description: \n\n " + currentUser.toPrettyString(), new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog, int which) {
+ activity.startActivity(new Intent(activity,FeedActivity.class));
+ }
+ });
+ }
+ });
+ } else {
+ AlertDialogHelpers.showAlert(activity,"Error Authenticating User","Invalid username or password.");
+ }
+ }
+ });
+ }
+
+ public static void logoutCurrentUser(@NonNull final Activity activity) {
+ UsergridAsync.disconnect("users", "me", "devices", UsergridSharedDevice.getSharedDevice(activity).getUuid(), new UsergridResponseCallback() {
+ @Override
+ public void onResponse(@NotNull UsergridResponse response) {
+ UsergridAsync.logoutCurrentUser(new UsergridResponseCallback() {
+ @Override
+ public void onResponse(@NotNull UsergridResponse response) {
+ System.out.print(response.toString());
+ }
+ });
+ }
+ });
+ }
+
+ public static void createUserAccount(@NonNull final Activity activity, @NonNull final String name, @NonNull final String username, @NonNull final String email, @NonNull final String password) {
+ final UsergridUser user = new UsergridUser(name,username,email,password);
+ UsergridUserAsync.create(user, new UsergridResponseCallback() {
+ @Override
+ public void onResponse(@NotNull UsergridResponse response) {
+ final UsergridUser responseUser = response.user();
+ if( response.ok() && responseUser != null ) {
+ AlertDialogHelpers.showScrollableAlert(activity, "Creating Account Successful", "User Description: \n\n " + responseUser.toPrettyString(), new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ activity.finish();
+ }
+ });
+ } else {
+ String errorMessage = "Unknown Error";
+ UsergridResponseError responseError = response.getResponseError();
+ if( responseError != null ) {
+ errorMessage = responseError.getErrorDescription();
+ }
+ AlertDialogHelpers.showAlert(activity,"Error Creating Account",errorMessage);
+ }
+ }
+ });
+ }
+
+ @SuppressWarnings("unchecked")
+ public static void getFeedMessages(@NonNull final GetFeedMessagesCallback callback) {
+ final UsergridQuery feedMessagesQuery = new UsergridQuery("users/me/feed").desc(UsergridEnums.UsergridEntityProperties.CREATED.toString());
+ UsergridAsync.GET(feedMessagesQuery, new UsergridResponseCallback() {
+ @Override
+ public void onResponse(@NotNull UsergridResponse response) {
+ ArrayList<ActivityEntity> feedMessages = new ArrayList<>();
+ if( response.ok() ) {
+ List feedEntities = response.getEntities();
+ if( feedEntities != null ) {
+ Collections.reverse(feedEntities);
+ feedMessages.addAll((List<ActivityEntity>)feedEntities);
+ }
+ }
+ callback.onResponse(feedMessages);
+ }
+ });
+ }
+
+ public static void postFeedMessage(@NonNull final String messageText, @NonNull final PostFeedMessageCallback callback) {
+ final UsergridUser currentUser = Usergrid.getCurrentUser();
+ if( currentUser != null ) {
+ String usernameOrEmail = currentUser.usernameOrEmail();
+ if( usernameOrEmail == null ) {
+ usernameOrEmail = "";
+ }
+ String email = currentUser.getEmail();
+ if( email == null ) {
+ email = "";
+ }
+ String picture = currentUser.getPicture();
+ final ActivityEntity activityEntity = new ActivityEntity(usernameOrEmail,email,picture,messageText);
+ UsergridAsync.POST("users/me/activities",activityEntity.toMapValue(), new UsergridResponseCallback() {
+ @Override
+ public void onResponse(@NotNull UsergridResponse response) {
+ final UsergridEntity responseEntity = response.entity();
+ if( response.ok() && responseEntity != null && responseEntity instanceof ActivityEntity ) {
+ callback.onSuccess((ActivityEntity)responseEntity);
+ UsergridManager.sendPushToFollowers(messageText);
+ }
+ }
+ });
+ }
+ }
+
+ public static void followUser(@NonNull final Activity activity, @NonNull final String username) {
+ UsergridAsync.connect("users", "me", "following", "users", username, new UsergridResponseCallback() {
+ @Override
+ public void onResponse(@NotNull UsergridResponse response) {
+ if( response.ok() ) {
+ activity.finish();
+ } else {
+ String errorMessage = "Unknown Error";
+ UsergridResponseError responseError = response.getResponseError();
+ if( responseError != null ) {
+ String errorDescription = responseError.getErrorDescription();
+ if( errorDescription != null ) {
+ errorMessage = errorDescription;
+ }
+ }
+ AlertDialogHelpers.showAlert(activity,"Error Following User",errorMessage);
+ }
+ }
+ });
+ }
+
+ public static void sendPushToFollowers(@NonNull final String message) {
+ HashMap<String,String> notificationMap = new HashMap<>();
+ notificationMap.put(ANDROID_NOTIFIER_ID,message);
+ final HashMap<String,HashMap<String,String>> payloadMap = new HashMap<>();
+ payloadMap.put("payloads",notificationMap);
+
+ UsergridAsync.GET("users/me/followers", new UsergridResponseCallback() {
+ @Override
+ public void onResponse(@NotNull UsergridResponse response) {
+ if( response.ok() ) {
+ String followerUserNames = "";
+ final List<UsergridUser> users = response.users();
+ if( users != null && !users.isEmpty() ) {
+ for( UsergridUser user : users ) {
+ String username = user.getUsername();
+ if( username != null && !username.isEmpty() ) {
+ followerUserNames += username + ";";
+ }
+ }
+ if( !followerUserNames.isEmpty() ) {
+ final UsergridRequest notificationRequest = new UsergridRequest(UsergridEnums.UsergridHttpMethod.POST,UsergridRequest.APPLICATION_JSON_MEDIA_TYPE,Usergrid.clientAppUrl(),null,payloadMap,Usergrid.authForRequests(),"users", followerUserNames, "notifications");
+ UsergridAsync.sendRequest(notificationRequest, new UsergridResponseCallback() {
+ @Override
+ public void onResponse(@NonNull UsergridResponse response) {}
+ });
+ }
+ }
+ }
+ }
+ });
+ }
+}
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/ActivityFeed/activityfeed/src/main/java/org/apache/usergrid/activityfeed/activities/CreateAccountActivity.java
----------------------------------------------------------------------
diff --git a/Samples/ActivityFeed/activityfeed/src/main/java/org/apache/usergrid/activityfeed/activities/CreateAccountActivity.java b/Samples/ActivityFeed/activityfeed/src/main/java/org/apache/usergrid/activityfeed/activities/CreateAccountActivity.java
new file mode 100644
index 0000000..0f72fbb
--- /dev/null
+++ b/Samples/ActivityFeed/activityfeed/src/main/java/org/apache/usergrid/activityfeed/activities/CreateAccountActivity.java
@@ -0,0 +1,67 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.usergrid.activityfeed.activities;
+
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.TextView;
+
+import org.apache.usergrid.activityfeed.R;
+import org.apache.usergrid.activityfeed.UsergridManager;
+import org.apache.usergrid.activityfeed.helpers.ActionBarHelpers;
+import org.apache.usergrid.activityfeed.helpers.AlertDialogHelpers;
+
+public class CreateAccountActivity extends AppCompatActivity {
+
+ private static final String actionBarTitle = "Create Account";
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_create_account);
+
+ ActionBarHelpers.setCustomViewForActionBarWithTitle(this,actionBarTitle);
+
+ final EditText nameText = (EditText) findViewById(R.id.nameText);
+ final EditText usernameEditText = (EditText) findViewById(R.id.usernameText);
+ final EditText emailText = (EditText) findViewById(R.id.emailText);
+ final EditText passwordEditText = (EditText) findViewById(R.id.passwordEditText);
+
+ final TextView createAccountTextView = (TextView) findViewById(R.id.createAccountText);
+ if( createAccountTextView != null ) {
+ createAccountTextView.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ if( nameText != null && usernameEditText != null && emailText != null && passwordEditText != null ) {
+ String name = nameText.getText().toString();
+ String username = usernameEditText.getText().toString();
+ String email = emailText.getText().toString();
+ String password = passwordEditText.getText().toString();
+ if(!name.isEmpty() && !username.isEmpty() && !email.isEmpty() && !password.isEmpty()) {
+ UsergridManager.createUserAccount(CreateAccountActivity.this,name,username,email,password);
+ } else {
+ AlertDialogHelpers.showAlert(CreateAccountActivity.this,"Error Creating Account","All fields must not be empty.");
+ }
+ }
+
+ }
+ });
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/ActivityFeed/activityfeed/src/main/java/org/apache/usergrid/activityfeed/activities/FeedActivity.java
----------------------------------------------------------------------
diff --git a/Samples/ActivityFeed/activityfeed/src/main/java/org/apache/usergrid/activityfeed/activities/FeedActivity.java b/Samples/ActivityFeed/activityfeed/src/main/java/org/apache/usergrid/activityfeed/activities/FeedActivity.java
new file mode 100644
index 0000000..4f347f8
--- /dev/null
+++ b/Samples/ActivityFeed/activityfeed/src/main/java/org/apache/usergrid/activityfeed/activities/FeedActivity.java
@@ -0,0 +1,142 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.usergrid.activityfeed.activities;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.v7.app.AppCompatActivity;
+import android.text.TextUtils;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.ListView;
+
+import org.apache.usergrid.activityfeed.ActivityEntity;
+import org.apache.usergrid.activityfeed.R;
+import org.apache.usergrid.activityfeed.UsergridManager;
+import org.apache.usergrid.activityfeed.callbacks.GetFeedMessagesCallback;
+import org.apache.usergrid.activityfeed.callbacks.PostFeedMessageCallback;
+import org.apache.usergrid.activityfeed.helpers.ActionBarHelpers;
+import org.apache.usergrid.activityfeed.helpers.FeedAdapter;
+import org.apache.usergrid.java.client.Usergrid;
+import org.apache.usergrid.java.client.model.UsergridUser;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class FeedActivity extends AppCompatActivity {
+
+ private EditText messageET;
+ private ListView messagesContainer;
+ private FeedAdapter adapter;
+ private ArrayList<ActivityEntity> feedMessages;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_feed);
+
+ final UsergridUser currentUser = Usergrid.getCurrentUser();
+ String username = "Unknown";
+ if( currentUser != null ) {
+ String currentUsername = currentUser.getUsername();
+ if( currentUsername != null ) {
+ username = currentUser.getUsername();
+ }
+ }
+ final Intent followActivityIntent = new Intent(this,FollowActivity.class);
+ ActionBarHelpers.setCustomViewForActionBarWithTitle(this, username + "'s feed", "Follow", new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ FeedActivity.this.startActivity(followActivityIntent);
+ }
+ });
+
+ initControls();
+ }
+
+ private void initControls() {
+ messagesContainer = (ListView) findViewById(R.id.messagesContainer);
+ messageET = (EditText) findViewById(R.id.messageEdit);
+ if(messageET != null) {
+ messageET.setMaxWidth(messageET.getWidth());
+ }
+ final Button sendBtn = (Button) findViewById(R.id.chatSendButton);
+ if( sendBtn != null ) {
+ sendBtn.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ String messageText = messageET.getText().toString();
+ if (TextUtils.isEmpty(messageText)) {
+ return;
+ }
+
+ UsergridManager.postFeedMessage(messageText, new PostFeedMessageCallback() {
+ @Override
+ public void onSuccess(@NonNull ActivityEntity activityEntity) {
+ displayMessage(activityEntity);
+ }
+ });
+ messageET.setText("");
+ }
+ });
+ }
+ }
+
+ private void displayMessage(ActivityEntity message) {
+ adapter.add(message);
+ adapter.notifyDataSetChanged();
+ scroll();
+ }
+
+ private void scroll() {
+ messagesContainer.setSelection(messagesContainer.getCount() - 1);
+ }
+
+ @SuppressWarnings("unchecked")
+ private void loadMessages(){
+
+ feedMessages = new ArrayList<>();
+ adapter = new FeedAdapter(FeedActivity.this, new ArrayList<ActivityEntity>());
+ messagesContainer.setAdapter(adapter);
+
+ UsergridManager.getFeedMessages(new GetFeedMessagesCallback() {
+ @Override
+ public void onResponse(@NonNull List<ActivityEntity> feedMessages) {
+ FeedActivity.this.feedMessages.addAll(feedMessages);
+ for( ActivityEntity activityEntity : FeedActivity.this.feedMessages ) {
+ displayMessage(activityEntity);
+ }
+ }
+ });
+ }
+
+ @Override
+ protected void onResume() {
+ this.loadMessages();
+ super.onResume();
+ }
+
+ @Override
+ protected void onDestroy() {
+ if( Usergrid.getCurrentUser() != null ) {
+ UsergridManager.logoutCurrentUser(this);
+ }
+ super.onDestroy();
+ }
+}
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/ActivityFeed/activityfeed/src/main/java/org/apache/usergrid/activityfeed/activities/FollowActivity.java
----------------------------------------------------------------------
diff --git a/Samples/ActivityFeed/activityfeed/src/main/java/org/apache/usergrid/activityfeed/activities/FollowActivity.java b/Samples/ActivityFeed/activityfeed/src/main/java/org/apache/usergrid/activityfeed/activities/FollowActivity.java
new file mode 100644
index 0000000..c4aac27
--- /dev/null
+++ b/Samples/ActivityFeed/activityfeed/src/main/java/org/apache/usergrid/activityfeed/activities/FollowActivity.java
@@ -0,0 +1,59 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.usergrid.activityfeed.activities;
+
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+
+import org.apache.usergrid.activityfeed.R;
+import org.apache.usergrid.activityfeed.UsergridManager;
+import org.apache.usergrid.activityfeed.helpers.ActionBarHelpers;
+import org.apache.usergrid.activityfeed.helpers.AlertDialogHelpers;
+
+public class FollowActivity extends AppCompatActivity {
+
+ private static final String actionBarTitle = "Follow";
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_follow);
+
+ ActionBarHelpers.setCustomViewForActionBarWithTitle(this,actionBarTitle);
+
+ final EditText usernameEditText = (EditText) findViewById(R.id.followUsernameText);
+ final Button addFollowerButton = (Button) findViewById(R.id.addFollowerButton);
+ if( addFollowerButton != null ) {
+ addFollowerButton.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ if( usernameEditText != null ) {
+ final String username = usernameEditText.getText().toString();
+ if( !username.isEmpty() ) {
+ UsergridManager.followUser(FollowActivity.this,username);
+ } else {
+ AlertDialogHelpers.showAlert(FollowActivity.this,"Error Following User","Please enter a valid username.");
+ }
+ }
+ }
+ });
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/ActivityFeed/activityfeed/src/main/java/org/apache/usergrid/activityfeed/activities/MainActivity.java
----------------------------------------------------------------------
diff --git a/Samples/ActivityFeed/activityfeed/src/main/java/org/apache/usergrid/activityfeed/activities/MainActivity.java b/Samples/ActivityFeed/activityfeed/src/main/java/org/apache/usergrid/activityfeed/activities/MainActivity.java
new file mode 100644
index 0000000..338f829
--- /dev/null
+++ b/Samples/ActivityFeed/activityfeed/src/main/java/org/apache/usergrid/activityfeed/activities/MainActivity.java
@@ -0,0 +1,87 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.usergrid.activityfeed.activities;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.TextView;
+
+import org.apache.usergrid.activityfeed.R;
+import org.apache.usergrid.activityfeed.UsergridManager;
+import org.apache.usergrid.activityfeed.helpers.AlertDialogHelpers;
+import org.apache.usergrid.java.client.Usergrid;
+
+public class MainActivity extends AppCompatActivity {
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_main);
+
+ UsergridManager.initializeSharedInstance(this);
+
+ final EditText usernameEditText = (EditText) findViewById(R.id.usernameText);
+ if( usernameEditText != null ) {
+ usernameEditText.setSelection(usernameEditText.getText().length());
+ }
+ final EditText passwordEditText = (EditText) findViewById(R.id.passwordEditText);
+ if( passwordEditText != null ) {
+ passwordEditText.setSelection(passwordEditText.getText().length());
+ }
+
+ final Button signInButton = (Button) findViewById(R.id.signInButton);
+ if( signInButton != null ) {
+ signInButton.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ if( usernameEditText != null && passwordEditText != null ) {
+ final String username = usernameEditText.getText().toString();
+ final String password = passwordEditText.getText().toString();
+ if( !username.isEmpty() && !password.isEmpty() ) {
+ UsergridManager.loginUser(MainActivity.this,username,password);
+ } else {
+ AlertDialogHelpers.showAlert(MainActivity.this,"Error Authenticating User","Username and password must not be empty.");
+ }
+ }
+ }
+ });
+ }
+
+ final TextView createAccountTextView = (TextView) findViewById(R.id.createAccountTextView);
+ if( createAccountTextView != null ) {
+ final Intent createAccountIntent = new Intent(this,CreateAccountActivity.class);
+ createAccountTextView.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ MainActivity.this.startActivity(createAccountIntent);
+ }
+ });
+ }
+ }
+
+ @Override
+ protected void onResume() {
+ if(Usergrid.getCurrentUser() != null) {
+ this.startActivity(new Intent(this,FeedActivity.class));
+ }
+ super.onResume();
+ }
+}
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/ActivityFeed/activityfeed/src/main/java/org/apache/usergrid/activityfeed/callbacks/GetFeedMessagesCallback.java
----------------------------------------------------------------------
diff --git a/Samples/ActivityFeed/activityfeed/src/main/java/org/apache/usergrid/activityfeed/callbacks/GetFeedMessagesCallback.java b/Samples/ActivityFeed/activityfeed/src/main/java/org/apache/usergrid/activityfeed/callbacks/GetFeedMessagesCallback.java
new file mode 100644
index 0000000..ae7b999
--- /dev/null
+++ b/Samples/ActivityFeed/activityfeed/src/main/java/org/apache/usergrid/activityfeed/callbacks/GetFeedMessagesCallback.java
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.usergrid.activityfeed.callbacks;
+
+import android.support.annotation.NonNull;
+
+import org.apache.usergrid.activityfeed.ActivityEntity;
+
+import java.util.List;
+
+public interface GetFeedMessagesCallback {
+ void onResponse(@NonNull final List<ActivityEntity> feedMessages);
+}
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/ActivityFeed/activityfeed/src/main/java/org/apache/usergrid/activityfeed/callbacks/PostFeedMessageCallback.java
----------------------------------------------------------------------
diff --git a/Samples/ActivityFeed/activityfeed/src/main/java/org/apache/usergrid/activityfeed/callbacks/PostFeedMessageCallback.java b/Samples/ActivityFeed/activityfeed/src/main/java/org/apache/usergrid/activityfeed/callbacks/PostFeedMessageCallback.java
new file mode 100644
index 0000000..14f5117
--- /dev/null
+++ b/Samples/ActivityFeed/activityfeed/src/main/java/org/apache/usergrid/activityfeed/callbacks/PostFeedMessageCallback.java
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.usergrid.activityfeed.callbacks;
+
+import android.support.annotation.NonNull;
+
+import org.apache.usergrid.activityfeed.ActivityEntity;
+
+public interface PostFeedMessageCallback {
+ void onSuccess(@NonNull final ActivityEntity activityEntity);
+}
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/ActivityFeed/activityfeed/src/main/java/org/apache/usergrid/activityfeed/helpers/ActionBarHelpers.java
----------------------------------------------------------------------
diff --git a/Samples/ActivityFeed/activityfeed/src/main/java/org/apache/usergrid/activityfeed/helpers/ActionBarHelpers.java b/Samples/ActivityFeed/activityfeed/src/main/java/org/apache/usergrid/activityfeed/helpers/ActionBarHelpers.java
new file mode 100644
index 0000000..46c2560
--- /dev/null
+++ b/Samples/ActivityFeed/activityfeed/src/main/java/org/apache/usergrid/activityfeed/helpers/ActionBarHelpers.java
@@ -0,0 +1,53 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.usergrid.activityfeed.helpers;
+
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.AppCompatActivity;
+import android.view.Gravity;
+import android.view.View;
+import android.widget.TextView;
+
+import org.apache.usergrid.activityfeed.R;
+
+public final class ActionBarHelpers {
+ private ActionBarHelpers() {}
+
+ public static void setCustomViewForActionBarWithTitle(@NonNull final AppCompatActivity activity, @Nullable final String title) {
+ ActionBarHelpers.setCustomViewForActionBarWithTitle(activity,title,null,null);
+ }
+
+ public static void setCustomViewForActionBarWithTitle(@NonNull final AppCompatActivity activity, @Nullable final String title, @Nullable final String rightButtonTitle, @Nullable final View.OnClickListener rightButtonOnClick) {
+ ActionBar actionBar = activity.getSupportActionBar();
+ if( actionBar != null ) {
+ actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
+ View actionBarView = View.inflate(activity, R.layout.action_bar_layout,null);
+ TextView actionBarTitleText = (TextView) actionBarView.findViewById(R.id.actionBarTitle);
+ actionBarTitleText.setText(title);
+ if( rightButtonTitle != null ) {
+ TextView rightTextView = (TextView) actionBarView.findViewById(R.id.buttonTitle);
+ rightTextView.setText(rightButtonTitle);
+ rightTextView.setOnClickListener(rightButtonOnClick);
+ }
+ final ActionBar.LayoutParams params = new ActionBar.LayoutParams(ActionBar.LayoutParams.WRAP_CONTENT, ActionBar.LayoutParams.MATCH_PARENT, Gravity.CENTER);
+ actionBar.setCustomView(actionBarView,params);
+ }
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/ActivityFeed/activityfeed/src/main/java/org/apache/usergrid/activityfeed/helpers/AlertDialogHelpers.java
----------------------------------------------------------------------
diff --git a/Samples/ActivityFeed/activityfeed/src/main/java/org/apache/usergrid/activityfeed/helpers/AlertDialogHelpers.java b/Samples/ActivityFeed/activityfeed/src/main/java/org/apache/usergrid/activityfeed/helpers/AlertDialogHelpers.java
new file mode 100644
index 0000000..e871271
--- /dev/null
+++ b/Samples/ActivityFeed/activityfeed/src/main/java/org/apache/usergrid/activityfeed/helpers/AlertDialogHelpers.java
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.usergrid.activityfeed.helpers;
+
+import android.app.Activity;
+import android.content.DialogInterface;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AlertDialog;
+import android.view.View;
+import android.widget.TextView;
+
+import org.apache.usergrid.activityfeed.R;
+
+@SuppressWarnings("unused")
+public final class AlertDialogHelpers {
+
+ private AlertDialogHelpers() {}
+
+ public static void showAlert(@NonNull final Activity activity, @Nullable final String title, @Nullable final String message) {
+ AlertDialogHelpers.showAlert(activity,title,message,null);
+ }
+
+ public static void showAlert(@NonNull final Activity activity, @Nullable final String title, @Nullable final String message, @Nullable final DialogInterface.OnClickListener onClickListener) {
+ new AlertDialog.Builder(activity)
+ .setTitle(title)
+ .setMessage(message)
+ .setPositiveButton(android.R.string.ok, onClickListener)
+ .show();
+ }
+
+ public static void showScrollableAlert(@NonNull final Activity activity, @Nullable final String title, @Nullable final String message) {
+ AlertDialogHelpers.showScrollableAlert(activity, title, message,null);
+ }
+
+ public static void showScrollableAlert(@NonNull final Activity activity, @Nullable final String title, @Nullable final String message, @Nullable final DialogInterface.OnClickListener onClickListener) {
+ final View scrollableAlertView = View.inflate(activity, R.layout.scrollable_alert_view, null);
+ final TextView titleTextView = (TextView) scrollableAlertView.findViewById(R.id.scrollableAlertTitle);
+ titleTextView.setText(title);
+ final TextView messageTextView = (TextView) scrollableAlertView.findViewById(R.id.scrollableAlertMessage);
+ messageTextView.setText(message);
+ new AlertDialog.Builder(activity)
+ .setView(scrollableAlertView)
+ .setPositiveButton(android.R.string.ok, onClickListener)
+ .show();
+ }
+}
[2/3] usergrid-android git commit: Initial commit of Usergrid Android
SDK in its own repo.
Posted by mr...@apache.org.
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/ActivityFeed/activityfeed/src/main/java/org/apache/usergrid/activityfeed/helpers/FeedAdapter.java
----------------------------------------------------------------------
diff --git a/Samples/ActivityFeed/activityfeed/src/main/java/org/apache/usergrid/activityfeed/helpers/FeedAdapter.java b/Samples/ActivityFeed/activityfeed/src/main/java/org/apache/usergrid/activityfeed/helpers/FeedAdapter.java
new file mode 100644
index 0000000..53494dd
--- /dev/null
+++ b/Samples/ActivityFeed/activityfeed/src/main/java/org/apache/usergrid/activityfeed/helpers/FeedAdapter.java
@@ -0,0 +1,153 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.usergrid.activityfeed.helpers;
+
+import android.app.Activity;
+import android.view.Gravity;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import org.apache.usergrid.activityfeed.ActivityEntity;
+import org.apache.usergrid.activityfeed.R;
+import org.apache.usergrid.java.client.Usergrid;
+import org.apache.usergrid.java.client.model.UsergridUser;
+
+import java.util.List;
+
+public class FeedAdapter extends BaseAdapter {
+ private final List<ActivityEntity> feedMessages;
+ private final Activity context;
+
+ public FeedAdapter(Activity context, List<ActivityEntity> feedMessages) {
+ this.context = context;
+ this.feedMessages = feedMessages;
+ }
+
+ @Override
+ public int getCount() {
+ if (feedMessages != null) {
+ return feedMessages.size();
+ } else {
+ return 0;
+ }
+ }
+
+ @Override
+ public ActivityEntity getItem(int position) {
+ if (feedMessages != null) {
+ return feedMessages.get(position);
+ } else {
+ return null;
+ }
+ }
+
+ @Override
+ public long getItemId(int position) {
+ return position;
+ }
+
+ @Override
+ public View getView(final int position, View convertView, ViewGroup parent) {
+ ViewHolder holder;
+ ActivityEntity messageEntity = getItem(position);
+ if (convertView == null) {
+ convertView = View.inflate(context,R.layout.message_layout,null);
+ holder = createViewHolder(convertView);
+ convertView.setTag(holder);
+ } else {
+ holder = (ViewHolder) convertView.getTag();
+ }
+
+ holder.txtMessage.setText(messageEntity.getContent());
+
+ boolean isMe = false;
+ String displayName = messageEntity.getDisplayName();
+ if( displayName != null ) {
+ final UsergridUser currentUser = Usergrid.getCurrentUser();
+ if( currentUser != null ) {
+ final String currentUserUsername = currentUser.getUsername();
+ if( currentUserUsername != null && displayName.equalsIgnoreCase(currentUserUsername) ) {
+ isMe = true;
+ }
+ }
+ holder.txtInfo.setText(displayName);
+ }
+ setAlignment(holder,isMe);
+ return convertView;
+ }
+
+ public void add(ActivityEntity message) {
+ feedMessages.add(message);
+ }
+
+ private void setAlignment(ViewHolder holder, boolean isMe) {
+ int gravity;
+ int drawableResourceId;
+ if( !isMe ) {
+ gravity = Gravity.END;
+ drawableResourceId = R.drawable.in_message_bg;
+ } else {
+ gravity = Gravity.START;
+ drawableResourceId = R.drawable.out_message_bg;
+ }
+
+ holder.contentWithBG.setBackgroundResource(drawableResourceId);
+
+ LinearLayout.LayoutParams layoutParams = (LinearLayout.LayoutParams) holder.contentWithBG.getLayoutParams();
+ layoutParams.gravity = gravity;
+ holder.contentWithBG.setLayoutParams(layoutParams);
+
+ RelativeLayout.LayoutParams lp = (RelativeLayout.LayoutParams) holder.content.getLayoutParams();
+ if( !isMe ) {
+ lp.addRule(RelativeLayout.ALIGN_PARENT_LEFT, 0);
+ lp.addRule(RelativeLayout.ALIGN_PARENT_RIGHT);
+ } else {
+ lp.addRule(RelativeLayout.ALIGN_PARENT_RIGHT, 0);
+ lp.addRule(RelativeLayout.ALIGN_PARENT_LEFT);
+ }
+
+ holder.content.setLayoutParams(lp);
+ layoutParams = (LinearLayout.LayoutParams) holder.txtMessage.getLayoutParams();
+ layoutParams.gravity = gravity;
+ holder.txtMessage.setLayoutParams(layoutParams);
+
+ layoutParams = (LinearLayout.LayoutParams) holder.txtInfo.getLayoutParams();
+ layoutParams.gravity = gravity;
+ holder.txtInfo.setLayoutParams(layoutParams);
+ }
+
+ private ViewHolder createViewHolder(View v) {
+ ViewHolder holder = new ViewHolder();
+ holder.txtMessage = (TextView) v.findViewById(R.id.txtMessage);
+ holder.content = (LinearLayout) v.findViewById(R.id.content);
+ holder.contentWithBG = (LinearLayout) v.findViewById(R.id.contentWithBackground);
+ holder.txtInfo = (TextView) v.findViewById(R.id.txtInfo);
+ return holder;
+ }
+
+
+ private static class ViewHolder {
+ public TextView txtMessage;
+ public TextView txtInfo;
+ public LinearLayout content;
+ public LinearLayout contentWithBG;
+ }
+}
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/ActivityFeed/activityfeed/src/main/res/drawable/in_message_bg.9.png
----------------------------------------------------------------------
diff --git a/Samples/ActivityFeed/activityfeed/src/main/res/drawable/in_message_bg.9.png b/Samples/ActivityFeed/activityfeed/src/main/res/drawable/in_message_bg.9.png
new file mode 100644
index 0000000..08c6f09
Binary files /dev/null and b/Samples/ActivityFeed/activityfeed/src/main/res/drawable/in_message_bg.9.png differ
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/ActivityFeed/activityfeed/src/main/res/drawable/out_message_bg.9.png
----------------------------------------------------------------------
diff --git a/Samples/ActivityFeed/activityfeed/src/main/res/drawable/out_message_bg.9.png b/Samples/ActivityFeed/activityfeed/src/main/res/drawable/out_message_bg.9.png
new file mode 100644
index 0000000..3d511e7
Binary files /dev/null and b/Samples/ActivityFeed/activityfeed/src/main/res/drawable/out_message_bg.9.png differ
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/ActivityFeed/activityfeed/src/main/res/drawable/usergridguy.png
----------------------------------------------------------------------
diff --git a/Samples/ActivityFeed/activityfeed/src/main/res/drawable/usergridguy.png b/Samples/ActivityFeed/activityfeed/src/main/res/drawable/usergridguy.png
new file mode 100644
index 0000000..b8a6844
Binary files /dev/null and b/Samples/ActivityFeed/activityfeed/src/main/res/drawable/usergridguy.png differ
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/ActivityFeed/activityfeed/src/main/res/layout/action_bar_layout.xml
----------------------------------------------------------------------
diff --git a/Samples/ActivityFeed/activityfeed/src/main/res/layout/action_bar_layout.xml b/Samples/ActivityFeed/activityfeed/src/main/res/layout/action_bar_layout.xml
new file mode 100644
index 0000000..f20a1f0
--- /dev/null
+++ b/Samples/ActivityFeed/activityfeed/src/main/res/layout/action_bar_layout.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:gravity="center">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:textColor="@android:color/white"
+ android:id="@+id/actionBarTitle"
+ android:textAppearance="?android:attr/textAppearanceLarge"
+ android:textSize="20sp"
+ android:gravity="center"
+ android:layout_centerInParent="true" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textColor="@android:color/white"
+ android:id="@+id/buttonTitle"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:textSize="17sp"
+ android:layout_alignParentEnd="true"
+ android:layout_centerVertical="true" />
+
+</RelativeLayout>
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/ActivityFeed/activityfeed/src/main/res/layout/activity_create_account.xml
----------------------------------------------------------------------
diff --git a/Samples/ActivityFeed/activityfeed/src/main/res/layout/activity_create_account.xml b/Samples/ActivityFeed/activityfeed/src/main/res/layout/activity_create_account.xml
new file mode 100644
index 0000000..1fba8ed
--- /dev/null
+++ b/Samples/ActivityFeed/activityfeed/src/main/res/layout/activity_create_account.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:paddingBottom="@dimen/activity_vertical_margin"
+ android:paddingLeft="@dimen/activity_horizontal_margin"
+ android:paddingRight="@dimen/activity_horizontal_margin"
+ android:paddingTop="@dimen/activity_vertical_margin"
+ tools:context=".activities.CreateAccountActivity"
+ android:background="@color/lightBlue">
+
+ <EditText
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/nameText"
+ android:minWidth="250dp"
+ android:background="@android:color/white"
+ android:height="40dp"
+ android:layout_marginTop="32dp"
+ android:hint="Name"
+ android:paddingStart="10dp"
+ android:singleLine="true"
+ android:minLines="1"
+ android:maxLines="1"
+ android:minHeight="30dp"
+ android:layout_centerHorizontal="true"
+ android:inputType="textPersonName"
+ android:maxWidth="250dp"
+ android:paddingEnd="10dp" />
+
+ <EditText
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/usernameText"
+ android:minWidth="250dp"
+ android:background="@android:color/white"
+ android:height="40dp"
+ android:layout_marginTop="15dp"
+ android:hint="Username"
+ android:paddingStart="10dp"
+ android:singleLine="true"
+ android:minLines="1"
+ android:maxLines="1"
+ android:minHeight="30dp"
+ android:layout_below="@+id/nameText"
+ android:layout_centerHorizontal="true"
+ android:paddingEnd="10dp"
+ android:maxWidth="250dp" />
+
+ <EditText
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/emailText"
+ android:minWidth="250dp"
+ android:background="@android:color/white"
+ android:height="40dp"
+ android:layout_marginTop="15dp"
+ android:hint="Email"
+ android:paddingStart="10dp"
+ android:singleLine="true"
+ android:minLines="1"
+ android:maxLines="1"
+ android:minHeight="30dp"
+ android:layout_below="@+id/usernameText"
+ android:layout_centerHorizontal="true"
+ android:inputType="textEmailAddress"
+ android:paddingEnd="10dp"
+ android:maxWidth="250dp" />
+
+ <EditText
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/passwordEditText"
+ android:minWidth="250dp"
+ android:background="@android:color/white"
+ android:height="40dp"
+ android:layout_marginTop="15dp"
+ android:hint="Password"
+ android:paddingStart="10dp"
+ android:singleLine="true"
+ android:minLines="1"
+ android:maxLines="1"
+ android:minHeight="30dp"
+ android:layout_below="@+id/emailText"
+ android:layout_centerHorizontal="true"
+ android:inputType="textPassword"
+ android:paddingEnd="10dp"
+ android:maxWidth="250dp" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="Create Account"
+ android:id="@+id/createAccountText"
+ android:textColor="@color/colorPrimary"
+ android:clickable="true"
+ android:layout_centerVertical="true"
+ android:layout_centerHorizontal="true"
+ android:textSize="20sp" />
+</RelativeLayout>
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/ActivityFeed/activityfeed/src/main/res/layout/activity_feed.xml
----------------------------------------------------------------------
diff --git a/Samples/ActivityFeed/activityfeed/src/main/res/layout/activity_feed.xml b/Samples/ActivityFeed/activityfeed/src/main/res/layout/activity_feed.xml
new file mode 100644
index 0000000..7e0789a
--- /dev/null
+++ b/Samples/ActivityFeed/activityfeed/src/main/res/layout/activity_feed.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/container"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ android:background="@color/white">
+
+ <EditText
+ android:id="@+id/messageEdit"
+ android:layout_width="match_parent"
+ android:layout_height="50dp"
+ android:layout_alignParentBottom="true"
+ android:hint="Message"
+ android:layout_alignBottom="@+id/chatSendButton"
+ android:layout_toStartOf="@+id/chatSendButton"
+ android:paddingEnd="10dp"
+ android:paddingStart="10dp" />
+
+ <Button
+ android:id="@+id/chatSendButton"
+ android:layout_width="wrap_content"
+ android:layout_height="50dp"
+ android:layout_alignParentBottom="true"
+ android:layout_alignParentEnd="true"
+ android:background="@color/colorPrimary"
+ android:text="Send"
+ android:textColor="@color/background_material_light"
+ android:layout_alignParentTop="false"
+ android:layout_alignParentStart="false" />
+
+ <ListView
+ android:id="@+id/messagesContainer"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_alignParentStart="false"
+ android:layout_alignParentTop="false"
+ android:layout_marginBottom="50dp"
+ android:listSelector="@android:color/transparent"
+ android:transcriptMode="alwaysScroll"
+ android:divider="@null"
+ android:background="@color/switch_thumb_normal_material_light"
+ android:paddingBottom="10dp"
+ android:stackFromBottom="true" />
+
+</RelativeLayout>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/ActivityFeed/activityfeed/src/main/res/layout/activity_follow.xml
----------------------------------------------------------------------
diff --git a/Samples/ActivityFeed/activityfeed/src/main/res/layout/activity_follow.xml b/Samples/ActivityFeed/activityfeed/src/main/res/layout/activity_follow.xml
new file mode 100644
index 0000000..c70da17
--- /dev/null
+++ b/Samples/ActivityFeed/activityfeed/src/main/res/layout/activity_follow.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:paddingBottom="@dimen/activity_vertical_margin"
+ android:paddingLeft="@dimen/activity_horizontal_margin"
+ android:paddingRight="@dimen/activity_horizontal_margin"
+ android:paddingTop="@dimen/activity_vertical_margin"
+ tools:context=".activities.FollowActivity"
+ android:background="@color/lightBlue">
+
+ <EditText
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/followUsernameText"
+ android:minWidth="250dp"
+ android:background="@android:color/white"
+ android:height="40dp"
+ android:layout_marginTop="70dp"
+ android:hint="Username"
+ android:paddingStart="10dp"
+ android:singleLine="true"
+ android:minLines="1"
+ android:maxLines="1"
+ android:minHeight="30dp"
+ android:inputType="textPersonName"
+ android:layout_alignParentTop="true"
+ android:layout_centerHorizontal="true"
+ android:paddingEnd="10dp"
+ android:maxWidth="250dp" />
+
+ <Button
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="Add Follower"
+ android:id="@+id/addFollowerButton"
+ android:minWidth="250dp"
+ android:background="@color/colorPrimary"
+ android:textColor="@android:color/white"
+ android:layout_below="@+id/followUsernameText"
+ android:layout_alignStart="@+id/followUsernameText"
+ android:layout_marginTop="30dp" />
+</RelativeLayout>
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/ActivityFeed/activityfeed/src/main/res/layout/activity_main.xml
----------------------------------------------------------------------
diff --git a/Samples/ActivityFeed/activityfeed/src/main/res/layout/activity_main.xml b/Samples/ActivityFeed/activityfeed/src/main/res/layout/activity_main.xml
new file mode 100644
index 0000000..af8038b
--- /dev/null
+++ b/Samples/ActivityFeed/activityfeed/src/main/res/layout/activity_main.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:paddingBottom="@dimen/activity_vertical_margin"
+ android:paddingLeft="@dimen/activity_horizontal_margin"
+ android:paddingRight="@dimen/activity_horizontal_margin"
+ android:paddingTop="@dimen/activity_vertical_margin"
+ tools:context=".activities.MainActivity"
+ android:background="@color/lightBlue">
+
+ <ImageView
+ android:layout_width="125dp"
+ android:layout_height="125dp"
+ android:id="@+id/imageView"
+ android:layout_alignParentTop="true"
+ android:layout_centerHorizontal="true"
+ android:src="@drawable/usergridguy"
+ android:layout_marginTop="20dp"
+ android:adjustViewBounds="true" />
+
+ <EditText
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/usernameText"
+ android:minWidth="250dp"
+ android:background="@android:color/white"
+ android:height="40dp"
+ android:layout_below="@+id/imageView"
+ android:layout_centerHorizontal="true"
+ android:layout_marginTop="30dp"
+ android:hint="Username"
+ android:paddingStart="10dp"
+ android:singleLine="true"
+ android:minLines="1"
+ android:maxLines="1"
+ android:minHeight="30dp"
+ android:paddingEnd="10dp"
+ android:maxWidth="250dp" />
+
+ <EditText
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/passwordEditText"
+ android:minWidth="250dp"
+ android:background="@android:color/white"
+ android:height="40dp"
+ android:layout_marginTop="15dp"
+ android:layout_below="@+id/usernameText"
+ android:layout_alignStart="@+id/usernameText"
+ android:hint="Password"
+ android:paddingStart="10dp"
+ android:singleLine="true"
+ android:maxLines="1"
+ android:minLines="1"
+ android:minHeight="30dp"
+ android:maxWidth="250dp"
+ android:paddingEnd="10dp"
+ android:inputType="textPassword" />
+
+ <Button
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="Sign In"
+ android:id="@+id/signInButton"
+ android:layout_below="@+id/passwordEditText"
+ android:layout_alignEnd="@+id/passwordEditText"
+ android:layout_marginTop="25dp"
+ android:minWidth="250dp"
+ android:background="@color/colorPrimary"
+ android:textColor="@android:color/white" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="Create Account"
+ android:id="@+id/createAccountTextView"
+ android:layout_below="@+id/signInButton"
+ android:layout_centerHorizontal="true"
+ android:layout_marginTop="30dp"
+ android:textColor="@color/colorPrimary"
+ android:clickable="true" />
+
+</RelativeLayout>
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/ActivityFeed/activityfeed/src/main/res/layout/message_layout.xml
----------------------------------------------------------------------
diff --git a/Samples/ActivityFeed/activityfeed/src/main/res/layout/message_layout.xml b/Samples/ActivityFeed/activityfeed/src/main/res/layout/message_layout.xml
new file mode 100644
index 0000000..da355b9
--- /dev/null
+++ b/Samples/ActivityFeed/activityfeed/src/main/res/layout/message_layout.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content">
+ <LinearLayout
+ android:id="@+id/content"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentRight="true"
+ android:orientation="vertical">
+
+ <TextView
+ android:id="@+id/txtInfo"
+ android:layout_width="wrap_content"
+ android:layout_height="40sp"
+ android:layout_gravity="left"
+ android:textSize="25sp"
+ android:textColor="@android:color/darker_gray"
+ android:layout_marginTop="10dp"
+ android:layout_marginLeft="10dp"
+ android:layout_marginRight="10dp" />
+
+ <LinearLayout
+ android:id="@+id/contentWithBackground"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="left"
+ android:background="@drawable/in_message_bg"
+ android:paddingLeft="10dp"
+ android:paddingBottom="10dp"
+ android:orientation="vertical">
+
+ <TextView
+ android:id="@+id/txtMessage"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textColor="@android:color/black"
+ android:maxWidth="240dp" />
+
+ </LinearLayout>
+
+ </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/ActivityFeed/activityfeed/src/main/res/layout/scrollable_alert_view.xml
----------------------------------------------------------------------
diff --git a/Samples/ActivityFeed/activityfeed/src/main/res/layout/scrollable_alert_view.xml b/Samples/ActivityFeed/activityfeed/src/main/res/layout/scrollable_alert_view.xml
new file mode 100644
index 0000000..a630675
--- /dev/null
+++ b/Samples/ActivityFeed/activityfeed/src/main/res/layout/scrollable_alert_view.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical">
+
+ <TextView
+ android:id="@+id/scrollableAlertTitle"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="16dip"
+ android:layout_marginRight="16dip"
+ android:layout_marginTop="10dip"
+ android:textAppearance="?android:attr/textAppearanceLarge" />
+
+ <ScrollView
+ android:layout_width="wrap_content" android:layout_height="wrap_content">
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
+
+ <TextView
+ android:id="@+id/scrollableAlertMessage"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="16dip"
+ android:layout_marginRight="16dip"
+ android:layout_marginTop="20dip"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:textColor="@color/colorPrimary"
+ android:background="@color/lightBlue"/>
+ </LinearLayout>
+ </ScrollView>
+</LinearLayout>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/ActivityFeed/activityfeed/src/main/res/mipmap-hdpi/ic_launcher.png
----------------------------------------------------------------------
diff --git a/Samples/ActivityFeed/activityfeed/src/main/res/mipmap-hdpi/ic_launcher.png b/Samples/ActivityFeed/activityfeed/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000..cde69bc
Binary files /dev/null and b/Samples/ActivityFeed/activityfeed/src/main/res/mipmap-hdpi/ic_launcher.png differ
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/ActivityFeed/activityfeed/src/main/res/mipmap-mdpi/ic_launcher.png
----------------------------------------------------------------------
diff --git a/Samples/ActivityFeed/activityfeed/src/main/res/mipmap-mdpi/ic_launcher.png b/Samples/ActivityFeed/activityfeed/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000..c133a0c
Binary files /dev/null and b/Samples/ActivityFeed/activityfeed/src/main/res/mipmap-mdpi/ic_launcher.png differ
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/ActivityFeed/activityfeed/src/main/res/mipmap-xhdpi/ic_launcher.png
----------------------------------------------------------------------
diff --git a/Samples/ActivityFeed/activityfeed/src/main/res/mipmap-xhdpi/ic_launcher.png b/Samples/ActivityFeed/activityfeed/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..bfa42f0
Binary files /dev/null and b/Samples/ActivityFeed/activityfeed/src/main/res/mipmap-xhdpi/ic_launcher.png differ
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/ActivityFeed/activityfeed/src/main/res/mipmap-xxhdpi/ic_launcher.png
----------------------------------------------------------------------
diff --git a/Samples/ActivityFeed/activityfeed/src/main/res/mipmap-xxhdpi/ic_launcher.png b/Samples/ActivityFeed/activityfeed/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000..324e72c
Binary files /dev/null and b/Samples/ActivityFeed/activityfeed/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/ActivityFeed/activityfeed/src/main/res/mipmap-xxxhdpi/ic_launcher.png
----------------------------------------------------------------------
diff --git a/Samples/ActivityFeed/activityfeed/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/Samples/ActivityFeed/activityfeed/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000..aee44e1
Binary files /dev/null and b/Samples/ActivityFeed/activityfeed/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/ActivityFeed/activityfeed/src/main/res/values-w820dp/dimens.xml
----------------------------------------------------------------------
diff --git a/Samples/ActivityFeed/activityfeed/src/main/res/values-w820dp/dimens.xml b/Samples/ActivityFeed/activityfeed/src/main/res/values-w820dp/dimens.xml
new file mode 100644
index 0000000..63fc816
--- /dev/null
+++ b/Samples/ActivityFeed/activityfeed/src/main/res/values-w820dp/dimens.xml
@@ -0,0 +1,6 @@
+<resources>
+ <!-- Example customization of dimensions originally defined in res/values/dimens.xml
+ (such as screen margins) for screens with more than 820dp of available width. This
+ would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
+ <dimen name="activity_horizontal_margin">64dp</dimen>
+</resources>
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/ActivityFeed/activityfeed/src/main/res/values/colors.xml
----------------------------------------------------------------------
diff --git a/Samples/ActivityFeed/activityfeed/src/main/res/values/colors.xml b/Samples/ActivityFeed/activityfeed/src/main/res/values/colors.xml
new file mode 100644
index 0000000..b26cbd3
--- /dev/null
+++ b/Samples/ActivityFeed/activityfeed/src/main/res/values/colors.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <color name="colorPrimary">#135480</color>
+ <color name="colorPrimaryDark">#135480</color>
+ <color name="colorAccent">#FF4081</color>
+ <color name="lightBlue">#E8EEED</color>
+ <color name="white">#ffffff</color>
+</resources>
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/ActivityFeed/activityfeed/src/main/res/values/dimens.xml
----------------------------------------------------------------------
diff --git a/Samples/ActivityFeed/activityfeed/src/main/res/values/dimens.xml b/Samples/ActivityFeed/activityfeed/src/main/res/values/dimens.xml
new file mode 100644
index 0000000..47c8224
--- /dev/null
+++ b/Samples/ActivityFeed/activityfeed/src/main/res/values/dimens.xml
@@ -0,0 +1,5 @@
+<resources>
+ <!-- Default screen margins, per the Android Design guidelines. -->
+ <dimen name="activity_horizontal_margin">16dp</dimen>
+ <dimen name="activity_vertical_margin">16dp</dimen>
+</resources>
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/ActivityFeed/activityfeed/src/main/res/values/strings.xml
----------------------------------------------------------------------
diff --git a/Samples/ActivityFeed/activityfeed/src/main/res/values/strings.xml b/Samples/ActivityFeed/activityfeed/src/main/res/values/strings.xml
new file mode 100644
index 0000000..583eb46
--- /dev/null
+++ b/Samples/ActivityFeed/activityfeed/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+ <string name="app_name">ActivityFeed</string>
+</resources>
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/ActivityFeed/activityfeed/src/main/res/values/styles.xml
----------------------------------------------------------------------
diff --git a/Samples/ActivityFeed/activityfeed/src/main/res/values/styles.xml b/Samples/ActivityFeed/activityfeed/src/main/res/values/styles.xml
new file mode 100644
index 0000000..8690628
--- /dev/null
+++ b/Samples/ActivityFeed/activityfeed/src/main/res/values/styles.xml
@@ -0,0 +1,19 @@
+<resources>
+
+ <!-- Base application theme. -->
+ <style name="AppTheme" parent="Theme.AppCompat.Light">
+ <!-- Customize your theme here. -->
+ <item name="colorPrimary">@color/colorPrimary</item>
+ <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+ <item name="colorAccent">@color/colorAccent</item>
+ </style>
+ <style name="MyActionBar" parent="@style/Widget.AppCompat.Light.ActionBar.Solid.Inverse">
+ <item name="background">@color/lightBlue</item>
+ <item name="titleTextStyle">@style/MyActionBarTitle</item>
+ </style>
+
+ <style name="MyActionBarTitle" parent="@style/TextAppearance.AppCompat.Widget.ActionBar.Title">
+ <item name="android:textColor">@color/white</item>
+ </style>
+
+</resources>
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/ActivityFeed/activityfeed/src/test/java/org/apache/usergrid/activityfeed/ExampleUnitTest.java
----------------------------------------------------------------------
diff --git a/Samples/ActivityFeed/activityfeed/src/test/java/org/apache/usergrid/activityfeed/ExampleUnitTest.java b/Samples/ActivityFeed/activityfeed/src/test/java/org/apache/usergrid/activityfeed/ExampleUnitTest.java
new file mode 100644
index 0000000..8230157
--- /dev/null
+++ b/Samples/ActivityFeed/activityfeed/src/test/java/org/apache/usergrid/activityfeed/ExampleUnitTest.java
@@ -0,0 +1,15 @@
+package org.apache.usergrid.activityfeed;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * To work on unit tests, switch the Test Artifact in the Build Variants view.
+ */
+public class ExampleUnitTest {
+ @Test
+ public void addition_isCorrect() throws Exception {
+ assertEquals(4, 2 + 2);
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/ActivityFeed/build.gradle
----------------------------------------------------------------------
diff --git a/Samples/ActivityFeed/build.gradle b/Samples/ActivityFeed/build.gradle
new file mode 100644
index 0000000..aff4f41
--- /dev/null
+++ b/Samples/ActivityFeed/build.gradle
@@ -0,0 +1,23 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+ repositories {
+ jcenter()
+ }
+ dependencies {
+ classpath 'com.android.tools.build:gradle:2.1.2'
+
+ // NOTE: Do not place your application dependencies here; they belong
+ // in the individual module build.gradle files
+ }
+}
+
+allprojects {
+ repositories {
+ jcenter()
+ }
+}
+
+task clean(type: Delete) {
+ delete rootProject.buildDir
+}
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/ActivityFeed/gradle.properties
----------------------------------------------------------------------
diff --git a/Samples/ActivityFeed/gradle.properties b/Samples/ActivityFeed/gradle.properties
new file mode 100644
index 0000000..1d3591c
--- /dev/null
+++ b/Samples/ActivityFeed/gradle.properties
@@ -0,0 +1,18 @@
+# Project-wide Gradle settings.
+
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+# Default value: -Xmx10248m -XX:MaxPermSize=256m
+# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/ActivityFeed/gradle/wrapper/gradle-wrapper.jar
----------------------------------------------------------------------
diff --git a/Samples/ActivityFeed/gradle/wrapper/gradle-wrapper.jar b/Samples/ActivityFeed/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..13372ae
Binary files /dev/null and b/Samples/ActivityFeed/gradle/wrapper/gradle-wrapper.jar differ
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/ActivityFeed/gradle/wrapper/gradle-wrapper.properties
----------------------------------------------------------------------
diff --git a/Samples/ActivityFeed/gradle/wrapper/gradle-wrapper.properties b/Samples/ActivityFeed/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..122a0dc
--- /dev/null
+++ b/Samples/ActivityFeed/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Mon Dec 28 10:00:20 PST 2015
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/ActivityFeed/gradlew
----------------------------------------------------------------------
diff --git a/Samples/ActivityFeed/gradlew b/Samples/ActivityFeed/gradlew
new file mode 100755
index 0000000..9d82f78
--- /dev/null
+++ b/Samples/ActivityFeed/gradlew
@@ -0,0 +1,160 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+## Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+ echo "$*"
+}
+
+die ( ) {
+ echo
+ echo "$*"
+ echo
+ exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+ CYGWIN* )
+ cygwin=true
+ ;;
+ Darwin* )
+ darwin=true
+ ;;
+ MINGW* )
+ msys=true
+ ;;
+esac
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG=`dirname "$PRG"`"/$link"
+ fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ if [ ! -x "$JAVACMD" ] ; then
+ die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+ fi
+else
+ JAVACMD="java"
+ which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+ MAX_FD_LIMIT=`ulimit -H -n`
+ if [ $? -eq 0 ] ; then
+ if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+ MAX_FD="$MAX_FD_LIMIT"
+ fi
+ ulimit -n $MAX_FD
+ if [ $? -ne 0 ] ; then
+ warn "Could not set maximum file descriptor limit: $MAX_FD"
+ fi
+ else
+ warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+ fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+ GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+ APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+ CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+ JAVACMD=`cygpath --unix "$JAVACMD"`
+
+ # We build the pattern for arguments to be converted via cygpath
+ ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+ SEP=""
+ for dir in $ROOTDIRSRAW ; do
+ ROOTDIRS="$ROOTDIRS$SEP$dir"
+ SEP="|"
+ done
+ OURCYGPATTERN="(^($ROOTDIRS))"
+ # Add a user-defined pattern to the cygpath arguments
+ if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+ OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+ fi
+ # Now convert the arguments - kludge to limit ourselves to /bin/sh
+ i=0
+ for arg in "$@" ; do
+ CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+ CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
+
+ if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
+ eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+ else
+ eval `echo args$i`="\"$arg\""
+ fi
+ i=$((i+1))
+ done
+ case $i in
+ (0) set -- ;;
+ (1) set -- "$args0" ;;
+ (2) set -- "$args0" "$args1" ;;
+ (3) set -- "$args0" "$args1" "$args2" ;;
+ (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+ (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+ (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+ (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+ (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+ (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+ esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+ JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/ActivityFeed/gradlew.bat
----------------------------------------------------------------------
diff --git a/Samples/ActivityFeed/gradlew.bat b/Samples/ActivityFeed/gradlew.bat
new file mode 100644
index 0000000..aec9973
--- /dev/null
+++ b/Samples/ActivityFeed/gradlew.bat
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/ActivityFeed/settings.gradle
----------------------------------------------------------------------
diff --git a/Samples/ActivityFeed/settings.gradle b/Samples/ActivityFeed/settings.gradle
new file mode 100644
index 0000000..05d5d93
--- /dev/null
+++ b/Samples/ActivityFeed/settings.gradle
@@ -0,0 +1,2 @@
+include ':activityfeed', ':UsergridAndroidSDK'
+project (":UsergridAndroidSDK").projectDir = new File("../../UsergridAndroidSDK")
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/Push/.gitignore
----------------------------------------------------------------------
diff --git a/Samples/Push/.gitignore b/Samples/Push/.gitignore
new file mode 100644
index 0000000..c6cbe56
--- /dev/null
+++ b/Samples/Push/.gitignore
@@ -0,0 +1,8 @@
+*.iml
+.gradle
+/local.properties
+/.idea/workspace.xml
+/.idea/libraries
+.DS_Store
+/build
+/captures
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/Push/build.gradle
----------------------------------------------------------------------
diff --git a/Samples/Push/build.gradle b/Samples/Push/build.gradle
new file mode 100644
index 0000000..6056b85
--- /dev/null
+++ b/Samples/Push/build.gradle
@@ -0,0 +1,22 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+ repositories {
+ jcenter()
+ }
+ dependencies {
+ classpath 'com.android.tools.build:gradle:2.1.2'
+ // NOTE: Do not place your application dependencies here; they belong
+ // in the individual module build.gradle files
+ }
+}
+
+allprojects {
+ repositories {
+ jcenter()
+ }
+}
+
+task clean(type: Delete) {
+ delete rootProject.buildDir
+}
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/Push/gradle.properties
----------------------------------------------------------------------
diff --git a/Samples/Push/gradle.properties b/Samples/Push/gradle.properties
new file mode 100644
index 0000000..1d3591c
--- /dev/null
+++ b/Samples/Push/gradle.properties
@@ -0,0 +1,18 @@
+# Project-wide Gradle settings.
+
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+# Default value: -Xmx10248m -XX:MaxPermSize=256m
+# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/Push/gradle/wrapper/gradle-wrapper.jar
----------------------------------------------------------------------
diff --git a/Samples/Push/gradle/wrapper/gradle-wrapper.jar b/Samples/Push/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..13372ae
Binary files /dev/null and b/Samples/Push/gradle/wrapper/gradle-wrapper.jar differ
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/Push/gradle/wrapper/gradle-wrapper.properties
----------------------------------------------------------------------
diff --git a/Samples/Push/gradle/wrapper/gradle-wrapper.properties b/Samples/Push/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..122a0dc
--- /dev/null
+++ b/Samples/Push/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Mon Dec 28 10:00:20 PST 2015
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/Push/gradlew
----------------------------------------------------------------------
diff --git a/Samples/Push/gradlew b/Samples/Push/gradlew
new file mode 100755
index 0000000..9d82f78
--- /dev/null
+++ b/Samples/Push/gradlew
@@ -0,0 +1,160 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+## Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+ echo "$*"
+}
+
+die ( ) {
+ echo
+ echo "$*"
+ echo
+ exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+ CYGWIN* )
+ cygwin=true
+ ;;
+ Darwin* )
+ darwin=true
+ ;;
+ MINGW* )
+ msys=true
+ ;;
+esac
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG=`dirname "$PRG"`"/$link"
+ fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ if [ ! -x "$JAVACMD" ] ; then
+ die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+ fi
+else
+ JAVACMD="java"
+ which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+ MAX_FD_LIMIT=`ulimit -H -n`
+ if [ $? -eq 0 ] ; then
+ if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+ MAX_FD="$MAX_FD_LIMIT"
+ fi
+ ulimit -n $MAX_FD
+ if [ $? -ne 0 ] ; then
+ warn "Could not set maximum file descriptor limit: $MAX_FD"
+ fi
+ else
+ warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+ fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+ GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+ APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+ CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+ JAVACMD=`cygpath --unix "$JAVACMD"`
+
+ # We build the pattern for arguments to be converted via cygpath
+ ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+ SEP=""
+ for dir in $ROOTDIRSRAW ; do
+ ROOTDIRS="$ROOTDIRS$SEP$dir"
+ SEP="|"
+ done
+ OURCYGPATTERN="(^($ROOTDIRS))"
+ # Add a user-defined pattern to the cygpath arguments
+ if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+ OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+ fi
+ # Now convert the arguments - kludge to limit ourselves to /bin/sh
+ i=0
+ for arg in "$@" ; do
+ CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+ CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
+
+ if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
+ eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+ else
+ eval `echo args$i`="\"$arg\""
+ fi
+ i=$((i+1))
+ done
+ case $i in
+ (0) set -- ;;
+ (1) set -- "$args0" ;;
+ (2) set -- "$args0" "$args1" ;;
+ (3) set -- "$args0" "$args1" "$args2" ;;
+ (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+ (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+ (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+ (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+ (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+ (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+ esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+ JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/Push/gradlew.bat
----------------------------------------------------------------------
diff --git a/Samples/Push/gradlew.bat b/Samples/Push/gradlew.bat
new file mode 100644
index 0000000..aec9973
--- /dev/null
+++ b/Samples/Push/gradlew.bat
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/Push/push/.gitignore
----------------------------------------------------------------------
diff --git a/Samples/Push/push/.gitignore b/Samples/Push/push/.gitignore
new file mode 100644
index 0000000..796b96d
--- /dev/null
+++ b/Samples/Push/push/.gitignore
@@ -0,0 +1 @@
+/build
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/Push/push/build.gradle
----------------------------------------------------------------------
diff --git a/Samples/Push/push/build.gradle b/Samples/Push/push/build.gradle
new file mode 100644
index 0000000..2b845b3
--- /dev/null
+++ b/Samples/Push/push/build.gradle
@@ -0,0 +1,27 @@
+apply plugin: 'com.android.application'
+
+android {
+ compileSdkVersion 23
+ buildToolsVersion "22.0.1"
+
+ defaultConfig {
+ applicationId "org.apache.usergrid.push"
+ minSdkVersion 17
+ targetSdkVersion 23
+ versionCode 1
+ versionName "1.0"
+ }
+ buildTypes {
+ release {
+ minifyEnabled false
+ proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+ }
+ }
+}
+
+dependencies {
+ compile fileTree(include: ['*.jar'], dir: 'libs')
+ testCompile 'junit:junit:4.12'
+ compile 'com.android.support:appcompat-v7:23.3.0'
+ compile project(':UsergridAndroidSDK')
+}
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/Push/push/libs/gcm.jar
----------------------------------------------------------------------
diff --git a/Samples/Push/push/libs/gcm.jar b/Samples/Push/push/libs/gcm.jar
new file mode 100755
index 0000000..ac109a8
Binary files /dev/null and b/Samples/Push/push/libs/gcm.jar differ
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/Push/push/proguard-rules.pro
----------------------------------------------------------------------
diff --git a/Samples/Push/push/proguard-rules.pro b/Samples/Push/push/proguard-rules.pro
new file mode 100644
index 0000000..73ed137
--- /dev/null
+++ b/Samples/Push/push/proguard-rules.pro
@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in /Users/ApigeeCorporation/Developer/android_sdk_files/sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+# http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+# public *;
+#}
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/Push/push/src/androidTest/java/org/apache/usergrid/push/ApplicationTest.java
----------------------------------------------------------------------
diff --git a/Samples/Push/push/src/androidTest/java/org/apache/usergrid/push/ApplicationTest.java b/Samples/Push/push/src/androidTest/java/org/apache/usergrid/push/ApplicationTest.java
new file mode 100644
index 0000000..a9f1c73
--- /dev/null
+++ b/Samples/Push/push/src/androidTest/java/org/apache/usergrid/push/ApplicationTest.java
@@ -0,0 +1,13 @@
+package org.apache.usergrid.push;
+
+import android.app.Application;
+import android.test.ApplicationTestCase;
+
+/**
+ * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
+ */
+public class ApplicationTest extends ApplicationTestCase<Application> {
+ public ApplicationTest() {
+ super(Application.class);
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/Push/push/src/main/AndroidManifest.xml
----------------------------------------------------------------------
diff --git a/Samples/Push/push/src/main/AndroidManifest.xml b/Samples/Push/push/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..bbfaaf4
--- /dev/null
+++ b/Samples/Push/push/src/main/AndroidManifest.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="org.apache.usergrid.push" >
+
+ <uses-permission android:name="android.permission.INTERNET" />
+ <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+ <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+ <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+ <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+ <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
+ <uses-permission android:name="android.permission.GET_ACCOUNTS" />
+ <uses-permission android:name="android.permission.WAKE_LOCK" />
+
+ <permission
+ android:name="org.apache.usergrid.push.gcm.permission.C2D_MESSAGE"
+ android:protectionLevel="signature" />
+
+ <uses-permission android:name="org.apache.usergrid.push.gcm.permission.C2D_MESSAGE" />
+
+ <application
+ android:allowBackup="true"
+ android:icon="@mipmap/ic_launcher"
+ android:label="@string/app_name"
+ android:supportsRtl="true"
+ android:theme="@style/AppTheme" >
+ <receiver
+ android:name="com.google.android.gcm.GCMBroadcastReceiver"
+ android:permission="com.google.android.c2dm.permission.SEND" >
+ <intent-filter>
+ <action android:name="com.google.android.c2dm.intent.RECEIVE" />
+ <action android:name="com.google.android.c2dm.intent.REGISTRATION" />
+
+ <category android:name="org.apache.usergrid.push" />
+ </intent-filter>
+ </receiver>
+
+ <service android:name=".GCMIntentService" />
+
+ <activity android:name=".MainActivity" >
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+
+ <category android:name="android.intent.category.LAUNCHER" />
+ </intent-filter>
+ </activity>
+ <activity android:name=".SettingsActivity" >
+ </activity>
+ </application>
+
+</manifest>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/Push/push/src/main/java/org/apache/usergrid/push/GCMIntentService.java
----------------------------------------------------------------------
diff --git a/Samples/Push/push/src/main/java/org/apache/usergrid/push/GCMIntentService.java b/Samples/Push/push/src/main/java/org/apache/usergrid/push/GCMIntentService.java
new file mode 100644
index 0000000..5faeb01
--- /dev/null
+++ b/Samples/Push/push/src/main/java/org/apache/usergrid/push/GCMIntentService.java
@@ -0,0 +1,85 @@
+package org.apache.usergrid.push;
+
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.Intent;
+import android.support.v4.app.NotificationCompat;
+import android.util.Log;
+
+import com.google.android.gcm.GCMBaseIntentService;
+
+public class GCMIntentService extends GCMBaseIntentService {
+
+ public GCMIntentService() {
+ super(MainActivity.GCM_SENDER_ID);
+ }
+
+ @Override
+ protected void onRegistered(Context context, String registrationId) {
+ Log.i(TAG, "Device registered: " + registrationId);
+ MainActivity.registerPush(context,registrationId);
+ }
+
+ @Override
+ protected void onUnregistered(Context context, String registrationId) {
+ Log.i(TAG, "Device unregistered");
+ }
+
+ @Override
+ protected void onMessage(Context context, Intent intent) {
+ String message = intent.getExtras().getString("data");
+ Log.i(TAG, "Received message: " + message);
+ generateNotification(context, message);
+ }
+
+ @Override
+ protected void onDeletedMessages(Context context, int total) {
+ Log.i(TAG, "Received deleted messages notification");
+ String message = "GCM server deleted " + total +" pending messages!";
+ generateNotification(context, message);
+ }
+
+ @Override
+ public void onError(Context context, String errorId) {
+ Log.i(TAG, "Received error: " + errorId);
+ }
+
+ @Override
+ protected boolean onRecoverableError(Context context, String errorId) {
+ Log.i(TAG, "Received recoverable error: " + errorId);
+ return super.onRecoverableError(context, errorId);
+ }
+
+ /**
+ * Issues a Notification to inform the user that server has sent a message.
+ */
+ private static void generateNotification(Context context, String message) {
+ long when = System.currentTimeMillis();
+ NotificationManager notificationManager = (NotificationManager)
+ context.getSystemService(Context.NOTIFICATION_SERVICE);
+
+ Intent notificationIntent = new Intent(context, MainActivity.class);
+ // set intent so it does not start a new activity
+ notificationIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
+ PendingIntent intent = PendingIntent.getActivity(context, 0, notificationIntent, 0);
+
+ Notification notification = new NotificationCompat.Builder(context)
+ .setContentText(message)
+ .setContentTitle(context.getString(R.string.app_name))
+ .setWhen(when)
+ .setSmallIcon(R.drawable.usergridguy)
+ .setContentIntent(intent)
+ .build();
+
+ notification.flags |= Notification.FLAG_AUTO_CANCEL;
+
+ // Play default notification sound
+ notification.defaults |= Notification.DEFAULT_SOUND;
+
+ // Vibrate if vibrate is enabled
+ notification.defaults |= Notification.DEFAULT_VIBRATE;
+ notificationManager.notify(0, notification);
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/Push/push/src/main/java/org/apache/usergrid/push/MainActivity.java
----------------------------------------------------------------------
diff --git a/Samples/Push/push/src/main/java/org/apache/usergrid/push/MainActivity.java b/Samples/Push/push/src/main/java/org/apache/usergrid/push/MainActivity.java
new file mode 100644
index 0000000..084dceb
--- /dev/null
+++ b/Samples/Push/push/src/main/java/org/apache/usergrid/push/MainActivity.java
@@ -0,0 +1,162 @@
+package org.apache.usergrid.push;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.v7.app.AppCompatActivity;
+import android.util.Log;
+import android.view.View;
+import android.widget.Button;
+import android.widget.ImageButton;
+
+import com.google.android.gcm.GCMRegistrar;
+
+import org.apache.usergrid.android.UsergridAsync;
+import org.apache.usergrid.android.UsergridSharedDevice;
+import org.apache.usergrid.android.callbacks.UsergridResponseCallback;
+import org.apache.usergrid.java.client.Usergrid;
+import org.apache.usergrid.java.client.UsergridClientConfig;
+import org.apache.usergrid.java.client.UsergridEnums;
+import org.apache.usergrid.java.client.UsergridRequest;
+import org.apache.usergrid.java.client.response.UsergridResponse;
+
+import java.util.HashMap;
+
+public class MainActivity extends AppCompatActivity {
+
+ public static String ORG_ID = "rwalsh";
+ public static String APP_ID = "sandbox";
+ public static String BASE_URL = "https://api.usergrid.com";
+
+ public static String NOTIFIER_ID = "androidPushNotifier";
+ public static String GCM_SENDER_ID = "186455511595";
+ public static String GCM_REGISTRATION_ID = "";
+
+ public static boolean USERGRID_PREFS_NEEDS_REFRESH = false;
+ private static final String USERGRID_PREFS_FILE_NAME = "usergrid_prefs.xml";
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_main);
+
+ retrieveSavedPrefs();
+ Usergrid.initSharedInstance(ORG_ID,APP_ID,BASE_URL);
+ MainActivity.registerPush(this);
+
+ final ImageButton infoButton = (ImageButton) findViewById(R.id.infoButton);
+ if( infoButton != null ) {
+ final Intent settingsActivity = new Intent(this, SettingsActivity.class);
+ infoButton.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ MainActivity.this.startActivity(settingsActivity);
+ }
+ });
+ }
+
+ final Button pushToThisDeviceButton = (Button) findViewById(R.id.pushToThisDevice);
+ if( pushToThisDeviceButton != null ) {
+ pushToThisDeviceButton.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ MainActivity.this.sendPush(UsergridSharedDevice.getSharedDeviceUUID(MainActivity.this),"Push To This Device");
+ }
+ });
+ }
+ final Button pushToAllDevicesButton = (Button) findViewById(R.id.pushToAllDevices);
+ if( pushToAllDevicesButton != null ) {
+ pushToAllDevicesButton.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ MainActivity.this.sendPush("*","Push To All Devices");
+ }
+ });
+ }
+ }
+
+ @Override
+ protected void onResume() {
+ if( USERGRID_PREFS_NEEDS_REFRESH ) {
+ Usergrid.setConfig(new UsergridClientConfig(ORG_ID,APP_ID,BASE_URL));
+ if( GCM_REGISTRATION_ID != null && !GCM_REGISTRATION_ID.isEmpty() ) {
+ UsergridAsync.applyPushToken(this, GCM_REGISTRATION_ID, MainActivity.NOTIFIER_ID, new UsergridResponseCallback() {
+ @Override
+ public void onResponse(@NonNull UsergridResponse response) { }
+ });
+ }
+ this.savePrefs();
+ USERGRID_PREFS_NEEDS_REFRESH = false;
+ }
+ super.onResume();
+ }
+
+ @Override
+ protected void onDestroy() {
+ this.savePrefs();
+ super.onDestroy();
+ }
+
+ public static void registerPush(Context context) {
+ final String regId = GCMRegistrar.getRegistrationId(context);
+ if ("".equals(regId)) {
+ GCMRegistrar.register(context, GCM_SENDER_ID);
+ } else {
+ if (GCMRegistrar.isRegisteredOnServer(context)) {
+ Log.i("", "Already registered with GCM");
+ } else {
+ MainActivity.registerPush(context, regId);
+ }
+ }
+ }
+
+ public static void registerPush(@NonNull final Context context, @NonNull final String registrationId) {
+ MainActivity.GCM_REGISTRATION_ID = registrationId;
+ UsergridAsync.applyPushToken(context, registrationId, MainActivity.NOTIFIER_ID, new UsergridResponseCallback() {
+ @Override
+ public void onResponse(@NonNull UsergridResponse response) {
+ if( !response.ok() ) {
+ System.out.print("Error Description :" + response.getResponseError().toString());
+ }
+ }
+ });
+ }
+
+ public void sendPush(@NonNull final String deviceId, @NonNull final String message) {
+ HashMap<String,String> notificationMap = new HashMap<>();
+ notificationMap.put(MainActivity.NOTIFIER_ID,message);
+ HashMap<String,HashMap<String,String>> payloadMap = new HashMap<>();
+ payloadMap.put("payloads",notificationMap);
+
+ UsergridRequest notificationRequest = new UsergridRequest(UsergridEnums.UsergridHttpMethod.POST,UsergridRequest.APPLICATION_JSON_MEDIA_TYPE,Usergrid.clientAppUrl(),null,payloadMap,Usergrid.authForRequests(),"devices", deviceId, "notifications");
+ UsergridAsync.sendRequest(notificationRequest, new UsergridResponseCallback() {
+ @Override
+ public void onResponse(@NonNull UsergridResponse response) {
+ System.out.print("Push request completed successfully :" + response.ok());
+ if(!response.ok() && response.getResponseError() != null) {
+ System.out.print("Error Description :" + response.getResponseError().toString());
+ }
+ }
+ });
+ }
+
+ public void savePrefs() {
+ SharedPreferences prefs = this.getSharedPreferences(USERGRID_PREFS_FILE_NAME, Context.MODE_PRIVATE);
+ SharedPreferences.Editor editor = prefs.edit();
+ editor.putString("ORG_ID", ORG_ID);
+ editor.putString("APP_ID", APP_ID);
+ editor.putString("BASE_URL", BASE_URL);
+ editor.putString("NOTIFIER_ID", NOTIFIER_ID);
+ editor.apply();
+ }
+
+ public void retrieveSavedPrefs() {
+ SharedPreferences prefs = this.getSharedPreferences(USERGRID_PREFS_FILE_NAME, Context.MODE_PRIVATE);
+ ORG_ID = prefs.getString("ORG_ID", ORG_ID);
+ APP_ID = prefs.getString("APP_ID", APP_ID);
+ BASE_URL = prefs.getString("BASE_URL",BASE_URL);
+ NOTIFIER_ID = prefs.getString("NOTIFIER_ID",NOTIFIER_ID);
+ }
+}
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/Push/push/src/main/java/org/apache/usergrid/push/SettingsActivity.java
----------------------------------------------------------------------
diff --git a/Samples/Push/push/src/main/java/org/apache/usergrid/push/SettingsActivity.java b/Samples/Push/push/src/main/java/org/apache/usergrid/push/SettingsActivity.java
new file mode 100644
index 0000000..54ea269
--- /dev/null
+++ b/Samples/Push/push/src/main/java/org/apache/usergrid/push/SettingsActivity.java
@@ -0,0 +1,68 @@
+package org.apache.usergrid.push;
+
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+
+import org.apache.usergrid.java.client.Usergrid;
+
+public class SettingsActivity extends AppCompatActivity {
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_settings);
+
+ final EditText orgIdEditText = (EditText) findViewById(R.id.orgId);
+ if( orgIdEditText != null ) {
+ orgIdEditText.setText(Usergrid.getOrgId());
+ }
+ final EditText appIdEditText = (EditText) findViewById(R.id.appId);
+ if( appIdEditText != null ) {
+ appIdEditText.setText(Usergrid.getAppId());
+ }
+ final EditText urlEditText = (EditText) findViewById(R.id.url);
+ if( urlEditText != null ) {
+ urlEditText.setText(Usergrid.getBaseUrl());
+ }
+ final EditText notifierIdEditText = (EditText) findViewById(R.id.notifierId);
+ if( notifierIdEditText != null ) {
+ notifierIdEditText.setText(MainActivity.NOTIFIER_ID);
+ }
+
+ final Button saveButton = (Button) findViewById(R.id.saveButton);
+ if( saveButton != null ) {
+ saveButton.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ if( orgIdEditText != null ) {
+ MainActivity.ORG_ID = orgIdEditText.getText().toString();
+ }
+ if( appIdEditText != null ) {
+ MainActivity.APP_ID = appIdEditText.getText().toString();
+ }
+ if( urlEditText != null ) {
+ MainActivity.BASE_URL = urlEditText.getText().toString();
+ }
+ if( notifierIdEditText != null ) {
+ MainActivity.NOTIFIER_ID = notifierIdEditText.getText().toString();
+ }
+ MainActivity.USERGRID_PREFS_NEEDS_REFRESH = true;
+ SettingsActivity.this.finish();
+ }
+ });
+ }
+
+ final Button cancelButton = (Button) findViewById(R.id.cancelButton);
+ if( cancelButton != null ) {
+ cancelButton.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ SettingsActivity.this.finish();
+ }
+ });
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/Push/push/src/main/res/drawable/info.png
----------------------------------------------------------------------
diff --git a/Samples/Push/push/src/main/res/drawable/info.png b/Samples/Push/push/src/main/res/drawable/info.png
new file mode 100644
index 0000000..534d0ae
Binary files /dev/null and b/Samples/Push/push/src/main/res/drawable/info.png differ
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/Push/push/src/main/res/drawable/usergridguy.png
----------------------------------------------------------------------
diff --git a/Samples/Push/push/src/main/res/drawable/usergridguy.png b/Samples/Push/push/src/main/res/drawable/usergridguy.png
new file mode 100644
index 0000000..b8a6844
Binary files /dev/null and b/Samples/Push/push/src/main/res/drawable/usergridguy.png differ
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/Push/push/src/main/res/layout/activity_main.xml
----------------------------------------------------------------------
diff --git a/Samples/Push/push/src/main/res/layout/activity_main.xml b/Samples/Push/push/src/main/res/layout/activity_main.xml
new file mode 100644
index 0000000..a365c94
--- /dev/null
+++ b/Samples/Push/push/src/main/res/layout/activity_main.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:paddingBottom="@dimen/activity_vertical_margin"
+ android:paddingLeft="@dimen/activity_horizontal_margin"
+ android:paddingRight="@dimen/activity_horizontal_margin"
+ android:paddingTop="@dimen/activity_vertical_margin"
+ tools:context=".MainActivity"
+ android:background="@color/colorPrimary">
+
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/usergridGuy"
+ android:minWidth="175dp"
+ android:minHeight="175dp"
+ android:maxHeight="175dp"
+ android:maxWidth="175dp"
+ android:clickable="false"
+ android:src="@drawable/usergridguy"
+ android:layout_centerVertical="true"
+ android:layout_alignStart="@+id/pushToAllDevices" />
+
+ <Button
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="Push To All Devices"
+ android:id="@+id/pushToAllDevices"
+ android:layout_alignParentBottom="true"
+ android:layout_centerHorizontal="true"
+ android:minHeight="175dp"
+ android:maxWidth="175dp"
+ android:minWidth="175dp"
+ android:maxHeight="175dp"
+ android:background="#95b8cb"
+ android:textColor="#ffffff"
+ android:textSize="10dp"
+ android:clickable="true" />
+
+ <Button
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="Push To This Device"
+ android:id="@+id/pushToThisDevice"
+ android:minHeight="175dp"
+ android:maxWidth="175dp"
+ android:minWidth="175dp"
+ android:maxHeight="175dp"
+ android:background="#95b8cb"
+ android:textColor="@color/background_floating_material_light"
+ android:textSize="10dp"
+ android:layout_alignParentTop="true"
+ android:layout_alignStart="@+id/usergridGuy"
+ android:clickable="true" />
+
+ <ImageButton
+ android:layout_width="30dp"
+ android:layout_height="30dp"
+ android:id="@+id/infoButton"
+ android:src="@drawable/info"
+ android:background="@null"
+ android:layout_alignParentBottom="true"
+ android:layout_alignParentEnd="true"
+ android:adjustViewBounds="true"
+ android:scaleType="centerCrop" />
+
+</RelativeLayout>
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/Push/push/src/main/res/layout/activity_settings.xml
----------------------------------------------------------------------
diff --git a/Samples/Push/push/src/main/res/layout/activity_settings.xml b/Samples/Push/push/src/main/res/layout/activity_settings.xml
new file mode 100644
index 0000000..0f6626b
--- /dev/null
+++ b/Samples/Push/push/src/main/res/layout/activity_settings.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:paddingLeft="@dimen/activity_horizontal_margin"
+ android:paddingRight="@dimen/activity_horizontal_margin"
+ android:paddingTop="@dimen/activity_vertical_margin"
+ android:paddingBottom="@dimen/activity_vertical_margin"
+ tools:context="org.apache.usergrid.push.SettingsActivity"
+ android:background="@color/colorPrimary"
+ android:minHeight="30dp">
+
+ <EditText
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/orgId"
+ android:layout_alignParentTop="true"
+ android:layout_centerHorizontal="true"
+ android:minWidth="300dp"
+ android:background="@android:color/white"
+ android:layout_marginTop="30dp"
+ android:hint="Org Id"
+ android:paddingStart="10dp"
+ android:minHeight="30dp"
+ android:maxLines="1"
+ android:singleLine="true"
+ android:maxWidth="300dp" />
+
+ <EditText
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/appId"
+ android:minWidth="300dp"
+ android:background="@android:color/white"
+ android:layout_marginTop="30dp"
+ android:layout_below="@+id/orgId"
+ android:layout_centerHorizontal="true"
+ android:hint="App Id"
+ android:paddingStart="10dp"
+ android:minHeight="30dp"
+ android:maxLines="1"
+ android:singleLine="true"
+ android:maxWidth="300dp" />
+
+ <EditText
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/url"
+ android:minWidth="300dp"
+ android:background="@android:color/white"
+ android:layout_marginTop="30dp"
+ android:layout_below="@+id/appId"
+ android:layout_centerHorizontal="true"
+ android:hint="URL"
+ android:paddingStart="10dp"
+ android:minHeight="30dp"
+ android:maxLines="1"
+ android:singleLine="true"
+ android:maxWidth="300dp" />
+
+ <EditText
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/notifierId"
+ android:minWidth="300dp"
+ android:background="@android:color/white"
+ android:layout_marginTop="30dp"
+ android:layout_below="@+id/url"
+ android:layout_centerHorizontal="true"
+ android:hint="Notifier Id"
+ android:paddingStart="10dp"
+ android:minHeight="30dp"
+ android:maxLines="1"
+ android:singleLine="true"
+ android:maxWidth="300dp" />
+
+ <Button
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="Save"
+ android:id="@+id/saveButton"
+ android:layout_marginTop="23dp"
+ android:layout_below="@+id/notifierId"
+ android:layout_alignEnd="@+id/notifierId" />
+
+ <Button
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="Cancel"
+ android:id="@+id/cancelButton"
+ android:layout_alignTop="@+id/saveButton"
+ android:layout_alignStart="@+id/notifierId" />
+</RelativeLayout>
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/Push/push/src/main/res/mipmap-hdpi/ic_launcher.png
----------------------------------------------------------------------
diff --git a/Samples/Push/push/src/main/res/mipmap-hdpi/ic_launcher.png b/Samples/Push/push/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000..cde69bc
Binary files /dev/null and b/Samples/Push/push/src/main/res/mipmap-hdpi/ic_launcher.png differ
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/Push/push/src/main/res/mipmap-mdpi/ic_launcher.png
----------------------------------------------------------------------
diff --git a/Samples/Push/push/src/main/res/mipmap-mdpi/ic_launcher.png b/Samples/Push/push/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000..c133a0c
Binary files /dev/null and b/Samples/Push/push/src/main/res/mipmap-mdpi/ic_launcher.png differ
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/Push/push/src/main/res/mipmap-xhdpi/ic_launcher.png
----------------------------------------------------------------------
diff --git a/Samples/Push/push/src/main/res/mipmap-xhdpi/ic_launcher.png b/Samples/Push/push/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..bfa42f0
Binary files /dev/null and b/Samples/Push/push/src/main/res/mipmap-xhdpi/ic_launcher.png differ
http://git-wip-us.apache.org/repos/asf/usergrid-android/blob/4a794e46/Samples/Push/push/src/main/res/mipmap-xxhdpi/ic_launcher.png
----------------------------------------------------------------------
diff --git a/Samples/Push/push/src/main/res/mipmap-xxhdpi/ic_launcher.png b/Samples/Push/push/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000..324e72c
Binary files /dev/null and b/Samples/Push/push/src/main/res/mipmap-xxhdpi/ic_launcher.png differ