Merge branch 'master' of https://github.com/CroceRossaItaliana/gaia-a…

…ndroid into CroceRossaItaliana-master Conflicts: README.md Ripristino
CroceRossaItaliana · Apr 16, 2014 · ea1e1b7 · ea1e1b7
2 parents a75f7ed + 4f33401
commit ea1e1b7
Show file tree

Hide file tree

Showing 43 changed files with 3,800 additions and 48 deletions.
diff --git a/.classpath b/.classpath
@@ -3,6 +3,10 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
+	<classpathentry kind="lib" path="libs/Android-BitmapCache-2.3.jar"/>
+	<classpathentry kind="lib" path="libs/disklrucache-2.0.2.jar"/>
+	<classpathentry kind="lib" path="libs/crouton-library-1.8.2.jar"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/README.md b/README.md
@@ -21,7 +21,11 @@ Maggiori informazioni riguardo **il progetto Gaia di Croce Rossa Italiana** sono
 
 ## Stato attuale
 
+<<<<<<< HEAD
 [Scarica app allo stato beta](https://github.com/CroceRossaItaliana/gaia-android/blob/master/GaiaAndroidV0.6.7.apk?raw=true)
+=======
+[Scarica app allo stato beta](https://github.com/CroceRossaItaliana/gaia-android/blob/master/GaiaAndroidV0.6.4.apk?raw=true)
+>>>>>>> 4f33401032f9539b382dfeb210b797f66992a2a7
 
 
 ### La licenza 

diff --git a/bin/classes/com b/bin/classes/com
diff --git a/bin/classes/it/gaiacri/mobile/Accesso$1.class b/bin/classes/it/gaiacri/mobile/Accesso$1.class
diff --git a/bin/classes/it/gaiacri/mobile/Accesso$2.class b/bin/classes/it/gaiacri/mobile/Accesso$2.class
diff --git a/bin/classes/it/gaiacri/mobile/Accesso$3.class b/bin/classes/it/gaiacri/mobile/Accesso$3.class
diff --git a/bin/classes/it/gaiacri/mobile/Accesso$4.class b/bin/classes/it/gaiacri/mobile/Accesso$4.class
diff --git a/bin/classes/it/gaiacri/mobile/Accesso$RichiestaLogin.class b/bin/classes/it/gaiacri/mobile/Accesso$RichiestaLogin.class
diff --git a/bin/classes/it/gaiacri/mobile/Accesso$RichiestaWelcome.class b/bin/classes/it/gaiacri/mobile/Accesso$RichiestaWelcome.class
diff --git a/bin/classes/it/gaiacri/mobile/Accesso.class b/bin/classes/it/gaiacri/mobile/Accesso.class
diff --git a/bin/classes/it/gaiacri/mobile/BuildConfig.class b/bin/classes/it/gaiacri/mobile/BuildConfig.class
diff --git a/bin/classes/it/gaiacri/mobile/ElencoAttivita.class b/bin/classes/it/gaiacri/mobile/ElencoAttivita.class
diff --git a/bin/classes/it/gaiacri/mobile/IntentIntegrator$1.class b/bin/classes/it/gaiacri/mobile/IntentIntegrator$1.class
diff --git a/bin/classes/it/gaiacri/mobile/IntentIntegrator$2.class b/bin/classes/it/gaiacri/mobile/IntentIntegrator$2.class
diff --git a/bin/classes/it/gaiacri/mobile/IntentIntegrator.class b/bin/classes/it/gaiacri/mobile/IntentIntegrator.class
diff --git a/bin/classes/it/gaiacri/mobile/IntentResult.class b/bin/classes/it/gaiacri/mobile/IntentResult.class
diff --git a/bin/classes/it/gaiacri/mobile/MenuPrincipale$1.class b/bin/classes/it/gaiacri/mobile/MenuPrincipale$1.class
diff --git a/bin/classes/it/gaiacri/mobile/MenuPrincipale$2.class b/bin/classes/it/gaiacri/mobile/MenuPrincipale$2.class
diff --git a/bin/classes/it/gaiacri/mobile/MenuPrincipale$3.class b/bin/classes/it/gaiacri/mobile/MenuPrincipale$3.class
diff --git a/bin/classes/it/gaiacri/mobile/MenuPrincipale$RichiestaChiSono.class b/bin/classes/it/gaiacri/mobile/MenuPrincipale$RichiestaChiSono.class
diff --git a/bin/classes/it/gaiacri/mobile/MenuPrincipale$RichiestaLogout.class b/bin/classes/it/gaiacri/mobile/MenuPrincipale$RichiestaLogout.class
diff --git a/bin/classes/it/gaiacri/mobile/MenuPrincipale$RichiestaScansione$1.class b/bin/classes/it/gaiacri/mobile/MenuPrincipale$RichiestaScansione$1.class
diff --git a/bin/classes/it/gaiacri/mobile/MenuPrincipale$RichiestaScansione$2.class b/bin/classes/it/gaiacri/mobile/MenuPrincipale$RichiestaScansione$2.class
diff --git a/bin/classes/it/gaiacri/mobile/MenuPrincipale$RichiestaScansione.class b/bin/classes/it/gaiacri/mobile/MenuPrincipale$RichiestaScansione.class
diff --git a/bin/classes/it/gaiacri/mobile/MenuPrincipale.class b/bin/classes/it/gaiacri/mobile/MenuPrincipale.class
diff --git a/bin/classes/it/gaiacri/mobile/R$attr.class b/bin/classes/it/gaiacri/mobile/R$attr.class
diff --git a/bin/classes/it/gaiacri/mobile/R$dimen.class b/bin/classes/it/gaiacri/mobile/R$dimen.class
diff --git a/bin/classes/it/gaiacri/mobile/R$drawable.class b/bin/classes/it/gaiacri/mobile/R$drawable.class
diff --git a/bin/classes/it/gaiacri/mobile/R$id.class b/bin/classes/it/gaiacri/mobile/R$id.class
diff --git a/bin/classes/it/gaiacri/mobile/R$layout.class b/bin/classes/it/gaiacri/mobile/R$layout.class
diff --git a/bin/classes/it/gaiacri/mobile/R$menu.class b/bin/classes/it/gaiacri/mobile/R$menu.class
diff --git a/bin/classes/it/gaiacri/mobile/R$string.class b/bin/classes/it/gaiacri/mobile/R$string.class
diff --git a/bin/classes/it/gaiacri/mobile/R$style.class b/bin/classes/it/gaiacri/mobile/R$style.class
diff --git a/bin/classes/it/gaiacri/mobile/R.class b/bin/classes/it/gaiacri/mobile/R.class
diff --git a/bin/classes/it/gaiacri/mobile/Richiesta.class b/bin/classes/it/gaiacri/mobile/Richiesta.class
diff --git a/bin/dexedLibs/android-support-v4-714a29c0173cb8382e9a364153c9eaf5.jar b/bin/dexedLibs/android-support-v4-714a29c0173cb8382e9a364153c9eaf5.jar
diff --git a/bin/res/drawable-hdpi/ic_launcher.png b/bin/res/drawable-hdpi/ic_launcher.png
diff --git a/bin/res/drawable-ldpi/ic_launcher.png b/bin/res/drawable-ldpi/ic_launcher.png
diff --git a/bin/res/drawable-mdpi/ic_launcher.png b/bin/res/drawable-mdpi/ic_launcher.png
diff --git a/bin/res/drawable-xhdpi/ic_launcher.png b/bin/res/drawable-xhdpi/ic_launcher.png
diff --git a/gen/it/gaiacri/mobile/R.java b/gen/it/gaiacri/mobile/R.java
diff --git a/project.properties b/project.properties
@@ -13,3 +13,4 @@
 # Project target.
 target=android-17
 android.library.reference.1=../../workspace/android-support-v7-appcompat
+android.library.reference.2=../Android-Bootstrap/AndroidBootstrap
diff --git a/src/it/gaiacri/mobile/Richiesta.java b/src/it/gaiacri/mobile/Richiesta.java
@@ -27,6 +27,7 @@ public class Richiesta extends AsyncTask<String, String, String> {
 	protected static String sid = "";
 	public static String base = "https://gaia.cri.it/api.php";
 	//public static String base = "http://192.168.1.125/gaia/api.php";
+	//public static String base = "http://10.0.2.2/gaia/api.php";
 	public Context context;
 	public JSONObject risposta = null;
 	public JSONObject richiesta = null;
@@ -72,7 +73,7 @@ protected String doInBackground(String... params) {
 				JSONObject object = new JSONObject();
 				object.put("metodo", metodo());
 				object.put("sid", getSid());
-				object.put("key", "eb88e6f401ff19d1ce9f0a07c28fddbf08e661d3"); //server gaia.cri.it
+				object.put("key", "1aa50adbd038855c4c0f1e4953f2f98f18ccbd10"); //server gaia.cri.it
 				//object.put("key", "bb2c08ff4da11f0b590a7ae884412e2bfd8ac28a"); //server 
 				Iterator<String> ita = mData.keySet().iterator();
             	while (ita.hasNext()) {
@@ -124,7 +125,7 @@ protected String doInBackground(String... params) {
 						errore=5;
 					}
 					if(errore==0){
-						Log.i("Gaia", str);
+						//Log.i("Gaia", str);
 						try {
 							utente	 = risposta.getJSONObject("sessione").optJSONObject("utente");
 							sessione=risposta.getJSONObject("sessione");