New clasess to separate http operations of user account and user card

and code adaption
amcereijo · Dec 27, 2012 · 33e6afb · 33e6afb
1 parent 6abab18
commit 33e6afb
Show file tree

Hide file tree

Showing 10 changed files with 690 additions and 578 deletions.
diff --git a/src/com/trcardmanager/TRCardManagerActivity.java b/src/com/trcardmanager/TRCardManagerActivity.java
@@ -32,7 +32,7 @@
 import com.trcardmanager.dao.MovementDao;
 import com.trcardmanager.dao.UserDao;
 import com.trcardmanager.exception.TRCardManagerSessionException;
-import com.trcardmanager.http.TRCardManagerHttpAction;
+import com.trcardmanager.http.TRCardManagerHttpCardAction;
 import com.trcardmanager.myaccount.TRCardManagerMyAccountActivity;
 import com.trcardmanager.restaurant.TRCardManagerRestaurantsActivity;
 import com.trcardmanager.settings.TRCardManagerSettingsActivity;
@@ -257,12 +257,12 @@ private void addCardsToView(final UserDao user){
 
 
     private void loadMoreMovementsBackGround(final UserDao user){
-    	final TRCardManagerHttpAction httpAction = new TRCardManagerHttpAction();
+
     	new Thread(new Runnable() {
 			public void run() {
 				try {
-					user.getActualCard().getMovementsData().setNextMovements(
-						httpAction.getNextMovements(user));
+					List<MovementDao> movements = new TRCardManagerHttpCardAction().getNextMovements(user);
+					user.getActualCard().getMovementsData().setNextMovements(movements);
 				} catch (IOException e) {
 					Log.e(this.getClass().toString(), e.getMessage(),e);
 				}catch(TRCardManagerSessionException se){

diff --git a/src/com/trcardmanager/action/MovementListAction.java b/src/com/trcardmanager/action/MovementListAction.java
@@ -15,6 +15,7 @@
 import com.trcardmanager.dao.UserDao;
 import com.trcardmanager.exception.TRCardManagerSessionException;
 import com.trcardmanager.http.TRCardManagerHttpAction;
+import com.trcardmanager.http.TRCardManagerHttpCardAction;
 import com.trcardmanager.views.TRCardManagerListView;
 import com.trcardmanager.views.TRCardManagerListView.ScrollDirection;
 
@@ -70,9 +71,8 @@ protected void onPostExecute(Void result) {
 
     private List<MovementDao> updateMovements() {
     	List<MovementDao> myListItems = new ArrayList<MovementDao>();
-		TRCardManagerHttpAction httpAction = new TRCardManagerHttpAction();
     	try {
-    		myListItems = httpAction.updateLastMovementsAndBalance(user);
+    		myListItems = new TRCardManagerHttpCardAction().updateLastMovementsAndBalance(user);
     		if(myListItems == null || myListItems.size()==0){
     			myListItems = new ArrayList<MovementDao>();
 			}
@@ -110,9 +110,8 @@ public void run() {
 
 	private List<MovementDao> callHttpFindMovements(){
 		List<MovementDao> myListItems = new ArrayList<MovementDao>();
-		final TRCardManagerHttpAction httpAction = new TRCardManagerHttpAction();
 		try {
-			myListItems = httpAction.getNextMovements(user);
+			myListItems = new TRCardManagerHttpCardAction().getNextMovements(user);
 		} catch (IOException e) {
 			Log.e(this.getClass().toString(), e.getMessage(),e);
 		}catch(TRCardManagerSessionException se){

diff --git a/src/com/trcardmanager/action/TRCardManagerLoginAction.java b/src/com/trcardmanager/action/TRCardManagerLoginAction.java
@@ -20,7 +20,7 @@
 import com.trcardmanager.exception.TRCardManagerDataException;
 import com.trcardmanager.exception.TRCardManagerLoginException;
 import com.trcardmanager.exception.TRCardManagerSessionException;
-import com.trcardmanager.http.TRCardManagerHttpAction;
+import com.trcardmanager.http.TRCardManagerHttpUserAction;
 
 /**
  * 
@@ -99,8 +99,7 @@ protected Integer doInBackground(Void... params) {
 
 
 	private void httpLogin() throws TRCardManagerLoginException, ClientProtocolException, IOException{
-		TRCardManagerHttpAction httpAction = new TRCardManagerHttpAction();
-		httpAction.getCookieLogin(userDao);
+		new TRCardManagerHttpUserAction().getCookieLogin(userDao);
 	}
 
 

diff --git a/src/com/trcardmanager/action/UpdateCardAction.java b/src/com/trcardmanager/action/UpdateCardAction.java
@@ -17,7 +17,7 @@
 import com.trcardmanager.exception.TRCardManagerDataException;
 import com.trcardmanager.exception.TRCardManagerSessionException;
 import com.trcardmanager.exception.TRCardManagerUpdateCardException;
-import com.trcardmanager.http.TRCardManagerHttpAction;
+import com.trcardmanager.http.TRCardManagerHttpCardAction;
 
 
 /**
@@ -53,8 +53,7 @@ private void updateCard(String cardNumber){
     	try {
     		if(cardDao != null){
     			//http active card
-	    		TRCardManagerHttpAction httpAction = new TRCardManagerHttpAction();
-				httpAction.activateCard(userDao, cardDao);
+	    		new TRCardManagerHttpCardAction().activateCard(userDao, cardDao);
 
 				publishProgress();
 

diff --git a/src/com/trcardmanager/action/UpdatePasswordAction.java b/src/com/trcardmanager/action/UpdatePasswordAction.java
@@ -19,7 +19,7 @@
 import com.trcardmanager.exception.TRCardManagerDataException;
 import com.trcardmanager.exception.TRCardManagerSessionException;
 import com.trcardmanager.exception.TRCardManagerUpdatePasswordException;
-import com.trcardmanager.http.TRCardManagerHttpAction;
+import com.trcardmanager.http.TRCardManagerHttpUserAction;
 
 /**
  * 
@@ -50,18 +50,15 @@ protected Integer doInBackground(String... params) {
 	}
 
 	private void updatePassword(String newPassword){
-		TRCardManagerHttpAction httpAction = new TRCardManagerHttpAction();
 		try {
-			httpAction.changePassword(userDao, newPassword);
+			new TRCardManagerHttpUserAction().changePassword(userDao, newPassword);
 			CheckBox checkSave = (CheckBox)activity.findViewById(R.id.update_password_savedb);
 			//¿save in db?
 			if(checkSave.isChecked() && userDao.isRememberme()){
 				publishProgress();
 				TRCardManagerDbHelper dbHelper = new TRCardManagerDbHelper(activity.getApplicationContext());
 				dbHelper.updateUserPassword(userDao, newPassword);
 			}
-
-			//TODO return a code to principal activity to repaint screen
 			finalizeWithState(TRCardManagerApplication.PASSWORD_UPDATED);
 		} catch (ClientProtocolException e) {
 			Log.e(TAG,"Error updating password:"+e.getMessage(),e);

diff --git a/src/com/trcardmanager/action/UserDataAction.java b/src/com/trcardmanager/action/UserDataAction.java
@@ -10,7 +10,7 @@
 import com.trcardmanager.db.TRCardManagerDbHelper;
 import com.trcardmanager.exception.TRCardManagerDataException;
 import com.trcardmanager.exception.TRCardManagerSessionException;
-import com.trcardmanager.http.TRCardManagerHttpAction;
+import com.trcardmanager.http.TRCardManagerHttpCardAction;
 
 /**
  * 
@@ -30,7 +30,7 @@ public class UserDataAction {
 	public void loadAndSaveUserData(UserDao userDao) throws ClientProtocolException, IOException,
 		TRCardManagerDataException, TRCardManagerSessionException{
 
-			TRCardManagerHttpAction httpAction = new TRCardManagerHttpAction();
+			TRCardManagerHttpCardAction httpAction = new TRCardManagerHttpCardAction();
 			TRCardManagerDbHelper dbHelper = new TRCardManagerDbHelper(TRCardManagerApplication.getActualActivity());
 			//http actions
 			httpAction.getActualCard(userDao);