Changed the category parsing

Qorder · Jan 10, 2014 · 8f8ac3a · 8f8ac3a
1 parent f0cefcb
commit 8f8ac3a
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 46 deletions.
diff --git a/ClientAlphaPrototype/bin/ClientAlphaPrototype.apk b/ClientAlphaPrototype/bin/ClientAlphaPrototype.apk
diff --git a/ClientAlphaPrototype/bin/classes.dex b/ClientAlphaPrototype/bin/classes.dex
diff --git a/ClientAlphaPrototype/bin/jarlist.cache b/ClientAlphaPrototype/bin/jarlist.cache
@@ -0,0 +1,3 @@
+# cache for current jar dependency. DO NOT EDIT.
+# format is <lastModified> <length> <SHA-1> <path>
+# Encoding is UTF-8
diff --git a/ClientAlphaPrototype/src/qorder/clientprototype/activities/CategoriesActivity.java b/ClientAlphaPrototype/src/qorder/clientprototype/activities/CategoriesActivity.java
@@ -20,6 +20,7 @@
 import android.app.ProgressDialog;
 import android.content.Intent;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -34,43 +35,34 @@
 public class CategoriesActivity extends Activity {
 
 	ListView categories_listView;
-	List<Category> categories;
-	static String categoriesUrl = null;
+	static List<Category> categories = new ArrayList<Category>();
 	final boolean useMocks = false;
-	
+
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.activity_categories);
 
 		categories_listView = (ListView) findViewById(R.id.categories_listview);
-		categories = new ArrayList<Category>();
 		Bundle extras = getIntent().getExtras();
 
 		try {
-			if (extras != null)
-			{
-				String info = extras
-						.getString("initialInfo");
+			if (extras != null) {
+				String info = extras.getString("initialInfo");
 				String[] additionalInfo = info.split("_");
 				OrderHolder.setTableNumber(additionalInfo[0]);
-				OrderHolder.setWSPostUrI(additionalInfo[1]); 
-				CategoriesActivity.categoriesUrl = additionalInfo[2];
+				OrderHolder.setWSPostUrI(additionalInfo[1]);
+				parseJson(additionalInfo[2]);
 			}
-			if(useMocks)
-				createMockCategories();
-			else
-			parseJson(categoriesUrl);
-		} catch (ClientProtocolException e) {
-			e.printStackTrace();
-		} catch (ClassNotFoundException e) {
-			e.printStackTrace();
-		} catch (IOException e) {
-			e.printStackTrace();
-		} catch (JSONException e) {
-			e.printStackTrace();
+		} catch (Exception e) {
+			Log.e("exception thrown while parsing categories", e.getMessage());
 		}
 
+		if (useMocks)
+			createMockCategories();
+		// else
+		// parseJson(categoriesUrl);
+
 		initializeActionBar();
 		initializeArrayAdapter();
 	}
@@ -112,37 +104,38 @@ public boolean onOptionsItemSelected(MenuItem item) {
 	void parseJson(final String url) throws ClientProtocolException,
 			IOException, ClassNotFoundException, JSONException {
 
-		if (AndroidUtil.isNetworkAvailable(this) && url!=null) {
+		if (AndroidUtil.isNetworkAvailable(this) && url != null) {
 			final ProgressDialog progress = new ProgressDialog(this);
 			progress.setCancelable(false);
-			progress.setTitle(getResources().getString(R.string.title_fetch_menu_dialog));
-			progress.setMessage(getResources().getString(R.string.text_fetch_menu_dialog));
+			progress.setTitle(getResources().getString(
+					R.string.title_fetch_menu_dialog));
+			progress.setMessage(getResources().getString(
+					R.string.text_fetch_menu_dialog));
 			progress.show();
-			
+
 			new Thread(new Runnable() {
 				@Override
-				public void run() {		
+				public void run() {
 					try {
 						CategoryJsonParser jsonParser = new CategoryJsonParser();
 						JSONObject json = NetworkUtil.requestJsonObject(url);
 
 						categories = jsonParser.parse(json);
-						
+
 						OrderHolder.setBusinessName(json
 								.getString("businessName"));
-
-
-						//Testing the animation
-						/*long start = System.currentTimeMillis();
-						long end = start + 5*1000;
-						while (System.currentTimeMillis() < end)
-						{
-						  ;
-						}*/
-						//createMockCategories();
+
+						// Testing the animation
+						/*
+						 * long start = System.currentTimeMillis(); long end =
+						 * start + 5*1000; while (System.currentTimeMillis() <
+						 * end) { ; }
+						 */
+						// createMockCategories();
 
 					} catch (Exception e) {
-						errorFetchingMenu(getResources().getString(R.string.text_error_fetch_menu_mock));
+						errorFetchingMenu(getResources().getString(
+								R.string.text_error_fetch_menu_mock));
 					}
 
 					runOnUiThread(new Runnable() {
@@ -156,18 +149,17 @@ public void run() {
 				}
 			}).start();
 		} else {
-			errorFetchingMenu(getResources().getString(R.string.text_error_network));
+			errorFetchingMenu(getResources().getString(
+					R.string.text_error_network));
 		}
 	}
 
-	void errorFetchingMenu(String message)
-	{
-		Intent i = new Intent(getApplicationContext(),
-				ScanActivity.class);
+	void errorFetchingMenu(String message) {
+		Intent i = new Intent(getApplicationContext(), ScanActivity.class);
 		i.putExtra("error", message);
 		startActivity(i);
 	}
-	
+
 	// TODO: remove after debugging
 	void createMockCategories() {
 		OrderHolder.setBusinessName("business");

diff --git a/ClientAlphaPrototype/src/qorder/clientprototype/model/OrderHolder.java b/ClientAlphaPrototype/src/qorder/clientprototype/model/OrderHolder.java
@@ -12,7 +12,7 @@ public class OrderHolder {
 
 	//TODO: set these from QR
 	static String tableNumber = "1";
-	static String WSPostUrI = "www.something.troll";
+	static String WSPostUrI = null;
 	static String orderStatusURI = "http://snf-185147.vm.okeanos.grnet.gr:8080/qorderws/orders/order?id=";
 	static List<BasketProduct> order = new ArrayList<BasketProduct>();
 	static List<Order> submittedOrders = new ArrayList<Order>();