e-mission · joshzarrabi · Jun 2, 2015 · Jun 5, 2015 · Jun 10, 2015 · Jun 11, 2015
diff --git a/README.md b/README.md
@@ -41,3 +41,22 @@ And then copy over the sample files from these locations and replace the values
 
 Note that platform specific instructions are also available at in README files
 in the individual directories (MovesConnect for android and iOS for iOS).
+
+Trouble Shooting:
+
+If you are getting a compile error in which R can not be resolved
+it may be because you have an updated version of the android SDK. 
+
+To check if this is the case: 
+
+1. Open up tools/Android/SDKManager. 
+
+2. Check the version number of "SDK Platform"
+
+3. Open build.gradle in project:app
+
+4. Adjust the "compile SDK version" and "target SDK version to be the version number you found in step 2"
+
+5. Clean project
+
+6. Sync project with gradle file 
diff --git a/android/CordovaLib/CordovaLib.iml b/android/CordovaLib/CordovaLib.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="android" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.id=":CordovaLib" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="android" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
@@ -12,11 +12,12 @@
         <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
         <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
+        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
+        <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugTestSources" />
         <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/res" />
+        <option name="RES_FOLDERS_RELATIVE_PATH" value="" />
         <option name="LIBRARY_PROJECT" value="true" />
       </configuration>
     </facet>
@@ -82,5 +83,4 @@
     <orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
-</module>
-
+</module>
diff --git a/android/android.iml b/android/android.iml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="android" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="java-gradle" name="Java-Gradle">
       <configuration>
         <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
+        <option name="BUILDABLE" value="false" />
       </configuration>
     </facet>
   </component>
@@ -15,5 +16,4 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
-</module>
-
+</module>
diff --git a/android/app/app.iml b/android/app/app.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="android" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="android" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
@@ -12,8 +12,9 @@
         <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
         <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
+        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
+        <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugTestSources" />
         <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
@@ -83,12 +84,37 @@
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
-    <orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="support-v4-21.0.0" level="project" />
-    <orderEntry type="library" exported="" name="play-services-6.5.87" level="project" />
-    <orderEntry type="library" exported="" name="support-annotations-21.0.0" level="project" />
+    <orderEntry type="library" exported="" name="play-services-drive-7.0.0" level="project" />
+    <orderEntry type="library" exported="" name="play-services-maps-7.0.0" level="project" />
+    <orderEntry type="library" exported="" name="play-services-appindexing-7.0.0" level="project" />
+    <orderEntry type="library" exported="" name="play-services-cast-7.0.0" level="project" />
+    <orderEntry type="library" exported="" name="couchbase-lite-java-core-1.0.4" level="project" />
+    <orderEntry type="library" exported="" name="play-services-wearable-7.0.0" level="project" />
+    <orderEntry type="library" exported="" name="play-services-panorama-7.0.0" level="project" />
+    <orderEntry type="library" exported="" name="support-annotations-22.0.0" level="project" />
+    <orderEntry type="library" exported="" name="play-services-plus-7.0.0" level="project" />
+    <orderEntry type="library" exported="" name="jackson-core-asl-1.9.2" level="project" />
+    <orderEntry type="library" exported="" name="play-services-7.0.0" level="project" />
+    <orderEntry type="library" exported="" name="play-services-ads-7.0.0" level="project" />
+    <orderEntry type="library" exported="" name="play-services-base-7.0.0" level="project" />
+    <orderEntry type="library" exported="" name="play-services-location-7.0.0" level="project" />
+    <orderEntry type="library" exported="" name="stateless4j-2.4.0" level="project" />
+    <orderEntry type="library" exported="" name="play-services-gcm-7.0.0" level="project" />
+    <orderEntry type="library" exported="" name="play-services-safetynet-7.0.0" level="project" />
+    <orderEntry type="library" exported="" name="guava-18.0" level="project" />
+    <orderEntry type="library" exported="" name="play-services-nearby-7.0.0" level="project" />
+    <orderEntry type="library" exported="" name="gson-2.3" level="project" />
+    <orderEntry type="library" exported="" name="play-services-fitness-7.0.0" level="project" />
+    <orderEntry type="library" exported="" name="support-v4-22.0.0" level="project" />
+    <orderEntry type="library" exported="" name="jackson-mapper-asl-1.9.2" level="project" />
+    <orderEntry type="library" exported="" name="play-services-analytics-7.0.0" level="project" />
+    <orderEntry type="library" exported="" name="play-services-appstate-7.0.0" level="project" />
+    <orderEntry type="library" exported="" name="play-services-identity-7.0.0" level="project" />
+    <orderEntry type="library" exported="" name="play-services-games-7.0.0" level="project" />
+    <orderEntry type="library" exported="" name="play-services-wallet-7.0.0" level="project" />
+    <orderEntry type="library" exported="" name="couchbase-lite-android-1.0.4" level="project" />
     <orderEntry type="module" module-name="CordovaLib" exported="" />
   </component>
-</module>
-
+</module>
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 19
+    compileSdkVersion 22
     buildToolsVersion "21.1.2"
 
     defaultConfig {
         applicationId "edu.berkeley.eecs.e_mission"
         minSdkVersion 11
-        targetSdkVersion 18
+        targetSdkVersion 22
 
         testApplicationId "edu.berkeley.eecs.e_missionst"
         testInstrumentationRunner "android.test.InstrumentationTestRunner"
@@ -23,10 +23,31 @@ android {
     lintOptions {
         abortOnError false
     }
+    // workaround for "duplicate files during packaging of APK" issue
+    // see https://groups.google.com/d/msg/adt-dev/bl5Rc4Szpzg/wC8cylTWuIEJ
+    packagingOptions {
+        exclude 'META-INF/ASL2.0'
+        exclude 'META-INF/LICENSE'
+        exclude 'META-INF/NOTICE'
+    }
 }
 
 dependencies {
-    compile 'com.android.support:support-v4:19.1.0'
-    compile 'com.google.android.gms:play-services:+'
+    //compile 'com.android.support:support-v4:22.2.0'
+    compile 'com.google.android.gms:play-services:7.0.0'
     compile project(':CordovaLib')
+    compile 'com.google.code.gson:gson:2.3'
+    compile 'com.google.guava:guava:18.0'
+    //compile 'com.microsoft.azure:azure-mobile-services-android-sdk:2.0.2'
+    compile 'com.couchbase.lite:couchbase-lite-android:1.0.4'
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+    //compile 'com.android.support:appcompat-v7:22.+'
+    }
+
+/*
+dependencies {
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+    compile 'com.android.support:appcompat-v7:22.+'
+    compile 'com.couchbase.lite:couchbase-lite-android:1.0.4'
 }
+*/
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -62,6 +62,11 @@
             android:label="Cordova Tab Activity">
         </activity>
 
+        <activity
+            android:name=".data_sync.AzureSync"
+            android:label="MPG Activity">
+
+        </activity>
         <activity 
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale" 
             android:launchMode="singleTop" 
@@ -156,4 +161,6 @@
 
     </application>
 
+
+
 </manifest>
diff --git a/android/app/src/main/java/edu/berkeley/eecs/e_mission/CompetitionActivity.java b/android/app/src/main/java/edu/berkeley/eecs/e_mission/CompetitionActivity.java
@@ -0,0 +1,86 @@
+/*
+package edu.berkeley.eecs.e_mission;
+
+*/
+/**
+ * Created by RZarrabi on 6/5/2015.
+ *//*
+
+
+
+import java.net.MalformedURLException;
+import android.os.AsyncTask;
+import com.google.common.util.concurrent.FutureCallback;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.microsoft.windowsazure.mobileservices.MobileServiceClient;
+import com.microsoft.windowsazure.mobileservices.MobileServiceList;
+import com.microsoft.windowsazure.mobileservices.http.NextServiceFilterCallback;
+import com.microsoft.windowsazure.mobileservices.http.ServiceFilter;
+import com.microsoft.windowsazure.mobileservices.http.ServiceFilterRequest;
+import com.microsoft.windowsazure.mobileservices.http.ServiceFilterResponse;
+import com.microsoft.windowsazure.mobileservices.table.MobileServiceTable;
+import org.apache.cordova.CordovaActivity;
+
+public class CompetitionActivity extends CordovaActivity {
+
+    private MobileServiceClient mClient;
+    private MobileServiceTable<ScoreActivity> mToDoTable;
+
+    public boolean onCreate() {
+        try {
+// Create the Mobile Service Client instance, using the provided
+// Mobile Service URL and key
+            mClient = new MobileServiceClient(
+                    "https://e-mission.azure-mobile.net/",
+                    "aBNpasaSXoYAhvstmXYvtkEfFYudbt33", this
+            );
+            // Get the Mobile Service Table instance to use
+            mToDoTable = mClient.getTable(ScoreActivity.class);
+            return true;
+        } catch (MalformedURLException e) {
+            System.out.print("There was an error creating the Mobile Service. Verify the URL");
+        }
+        return false;
+    }
+
+
+    public void addItem(ScoreActivity thing) {
+        final ScoreActivity a = thing;
+        new AsyncTask<Void, Void, Void>() {
+
+	        @Override
+	        protected Void doInBackground(Void... params) {
+	            try {
+	                mToDoTable.insert(a).get();
+	            } catch (Exception exception) {
+	               // createAndShowDialog(exception, "Error");
+                 }
+	            return null;
+	        }
+	    }.execute();
+        }
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+*/