From d10e254269ec9f6982a6522ddc75282f88e59d80 Mon Sep 17 00:00:00 2001
From: drizea <danielrizea27@gmail.com>
Date: Fri, 20 Jul 2012 00:28:07 +0300
Subject: [PATCH] bookbag add item bug fix

---
 .../accountAccess/bookbags/BookBagDetails.java     | 28 +++++++++++++++++-----
 .../accountAccess/bookbags/BookbagsListView.java   |  8 +------
 .../searchCatalog/SearchCatalogListView.java       | 14 ++++++-----
 3 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/bookbags/BookBagDetails.java b/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/bookbags/BookBagDetails.java
index 082f739aa7..84066bed68 100644
--- a/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/bookbags/BookBagDetails.java
+++ b/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/bookbags/BookBagDetails.java
@@ -60,6 +60,8 @@ private String TAG = "BookBags";
 	
 	private Button delete_bookbag_button;
 	
+	
+	private Runnable getBookBagsItemsRunnable;
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		// TODO Auto-generated method stub
@@ -162,7 +164,7 @@ private String TAG = "BookBags";
 
 		});
 		
-		Thread getBookBags = new Thread(new Runnable() {
+		getBookBagsItemsRunnable = new Runnable() {
 			
 			@Override
 			public void run() {
@@ -183,6 +185,9 @@ private String TAG = "BookBags";
 					
 					@Override
 					public void run() {
+						
+						listAdapter.clear();
+						
 						for(int i=0;i<bookBag.items.size();i++)
 							listAdapter.add(bookBag.items.get(i));
 						
@@ -198,13 +203,14 @@ private String TAG = "BookBags";
 				
 				
 			}
-		});
+		};
+		
+		Thread getBookBags = new Thread(getBookBagsItemsRunnable);
 		
-		progressDialog = new ProgressDialog(context);
-		progressDialog.setMessage("Please wait while retrieving Book Bag data");
-		progressDialog.show();
+		progressDialog = ProgressDialog.show(context, "Please wait", "retrieving bookbag data");
 		getBookBags.start();
 
+
 	
 				
 
@@ -302,7 +308,17 @@ private String TAG = "BookBags";
 									runOnUiThread(new Runnable() {
 										@Override
 										public void run() {
-											progressDialog.dismiss();	
+											progressDialog.dismiss();
+											
+											Thread getBookBags = new Thread(getBookBagsItemsRunnable);
+											setResult(RESULT_CODE_UPDATE);
+											
+											
+											bookBag.items.remove(record);
+											progressDialog = ProgressDialog.show(context, "Please wait", "retrieving bookbag data");
+											getBookBags.start();
+											
+											
 										}
 									});
 								}
diff --git a/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/bookbags/BookbagsListView.java b/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/bookbags/BookbagsListView.java
index 1bac302c50..e213cb8818 100644
--- a/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/bookbags/BookbagsListView.java
+++ b/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/bookbags/BookbagsListView.java
@@ -187,18 +187,12 @@ public class BookbagsListView extends Activity{
 		
 		
 		if(accountAccess.isAuthenticated()){
-			getBookBags.start();
-			
+			getBookBags.start();	
 		}
 		else
 			Toast.makeText(context, "You must be authenticated to retrieve circ records", Toast.LENGTH_LONG);
-
-	
-				
-
 	}
 	
-	
 	@Override
 	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
 		// TODO Auto-generated method stub
diff --git a/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/SearchCatalogListView.java b/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/SearchCatalogListView.java
index 41eec1ed4a..3219e55d19 100644
--- a/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/SearchCatalogListView.java
+++ b/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/SearchCatalogListView.java
@@ -427,7 +427,7 @@ public class SearchCatalogListView extends Activity{
 	    			
 	
 	    			AlertDialog.Builder builder;
-	    			AlertDialog alertDialog;
+
 	
 	    			LayoutInflater inflater = (LayoutInflater) context.getSystemService(LAYOUT_INFLATER_SERVICE);
 	    			View layout = inflater.inflate(R.layout.bookbag_spinner,null);
@@ -438,7 +438,9 @@ public class SearchCatalogListView extends Activity{
 	    			ArrayAdapter adapter = new ArrayAdapter(context,android.R.layout.simple_spinner_item, array_spinner);
 	
 	    			s.setAdapter(adapter);
-	    			
+	    			builder = new AlertDialog.Builder(context);
+	    			builder.setView(layout);
+	    			final AlertDialog alertDialog = builder.create();
 	    			
 	    			add.setOnClickListener(new OnClickListener() {
 						
@@ -466,18 +468,18 @@ public class SearchCatalogListView extends Activity{
 										@Override
 										public void run() {
 											progressDialog.dismiss();
+											alertDialog.dismiss();
 										}
 									});
 
 								}
 					});
-							progressDialog.show(context, "Please wait", "Add to bookbag");
+							progressDialog = ProgressDialog.show(context, "Please wait", "Add to bookbag");
 							addtoBookbag.start();
+
 						}});
 	    			
-	    			builder = new AlertDialog.Builder(context);
-	    			builder.setView(layout);
-	    			alertDialog = builder.create();
+
 	    			alertDialog.show();
 	    			
 	    			
-- 
2.11.0