From 49e7117bd9ec7abc5e7a6c857c1fc8ea8f9e924d Mon Sep 17 00:00:00 2001 From: GME Date: Sat, 20 Apr 2019 12:22:15 +0200 Subject: [PATCH] update history --- .idea/caches/build_file_checksums.ser | Bin 541 -> 535 bytes .../mobile/history/HistoryActivity.java | 130 ++++++++++++++++-- .../java/monnethic/mobile/restApi/Config.java | 9 +- .../mobile/restApi/TransactionApiHandler.java | 13 +- 4 files changed, 131 insertions(+), 21 deletions(-) diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 010c3e1b36b3a250f52fe95fb0f43a0626bd46a0..19b65ad3a01ddc8cd04b8dedff12f833baee2ddf 100644 GIT binary patch delta 71 zcmV-N0J#611eXMmm;^cWfQgZuwUe3wL@0Z9O4)0TMpb{U@(V4tOs#YPCPO-0RdZ!> db6iJFMO-dta$#g_Wn7c-0UMKu0TPq&0WB*c98~}S delta 70 zcmV-M0J;B{1f2wsm;^E(E6tIdwG%8uI$TwAWpZ;|M|EjzY+-e6Ws|f4Hj_~SL=(vl ch#G3t@~&-IHhg transactions = new ArrayList<>(); + //function, wallet_hash, size, start_date, end_date try{ - transactions = new getTransactionTask().execute(Config.TRANSACTION_LATEST,wallet_hash).get(); + String myFormat = "dd-MM-yyyy"; + SimpleDateFormat sdf = new SimpleDateFormat(myFormat, Locale.FRANCE); + Date start_d = sdf.parse(fromDate.getText().toString()); + String start_date = String.valueOf(start_d.getTime()); + Date end_d = sdf.parse(toDate.getText().toString()); + String end_date = String.valueOf(end_d.getTime()); + + String size = inputSize.getText().toString(); + if(Integer.parseInt(function)==0){ + transactions = new getTransactionTask().execute(function,wallet_hash).get(); + } else if(Integer.parseInt(function)==1 || Integer.parseInt(function)==2 || Integer.parseInt(function)==3){ + transactions = new getTransactionTask().execute(function,wallet_hash,size).get(); + } else { + transactions = new getTransactionTask().execute(function,wallet_hash,size,start_date,end_date).get(); + } }catch (Exception e){ e.printStackTrace(); } @@ -183,13 +235,50 @@ public class HistoryActivity extends AppCompatActivity { } private class getTransactionTask extends AsyncTask,ArrayList> { + ProgressDialog progDailog = new ProgressDialog(HistoryActivity.this); + @Override + protected void onPreExecute() { + super.onPreExecute(); + progDailog.setMessage("Searching..."); + progDailog.setIndeterminate(false); + progDailog.setProgressStyle(ProgressDialog.STYLE_SPINNER); + progDailog.setCancelable(true); + progDailog.show(); + } + + @Override + protected void onPostExecute(ArrayList t) { + progDailog.dismiss(); + } @Override protected ArrayList doInBackground(String... strings) { ArrayList transactionsList = new ArrayList<>(); try{ TransactionApiHandler transactionApiHandler = new TransactionApiHandler(); - transactionsList = transactionApiHandler.getTransactions(strings[0],strings[1]); + switch (Integer.parseInt(strings[0])){ + case 0: + transactionsList = transactionApiHandler.getTransactions(strings[0],Config.TRANSACTION_LATEST,strings[1],null,null,null); + break; + case 1: + transactionsList = transactionApiHandler.getTransactions(strings[0],Config.TRANSACTION_ALL,strings[1],strings[2],null,null); + break; + case 2: + transactionsList = transactionApiHandler.getTransactions(strings[0],Config.TRANSACTION_SENT,strings[1],strings[2],null,null); + break; + case 3: + transactionsList = transactionApiHandler.getTransactions(strings[0],Config.TRANSACTION_RECEIVED,strings[1],strings[2],null,null); + break; + case 4: + transactionsList = transactionApiHandler.getTransactions(strings[0],Config.TRANSACTION_ALL,strings[1],strings[2],strings[3],strings[4]); + break; + case 5: + transactionsList = transactionApiHandler.getTransactions(strings[0],Config.TRANSACTION_SENT,strings[1],strings[2],strings[3],strings[4]); + break; + case 6: + transactionsList = transactionApiHandler.getTransactions(strings[0],Config.TRANSACTION_RECEIVED,strings[1],strings[2],strings[3],strings[4]); + break; + } }catch (Exception e){ e.printStackTrace(); } @@ -197,6 +286,23 @@ public class HistoryActivity extends AppCompatActivity { } } + @Override + protected void onStop() { + super.onStop(); // Always call the superclass method first + new EndSessionTask().execute(session_id); + } + private class EndSessionTask extends AsyncTask { + @Override + protected Void doInBackground(String... strings) { + try{ + SessionApiHandler sessionApiHandler = new SessionApiHandler(); + sessionApiHandler.endSession(strings[0]); + }catch (Exception e){ + e.printStackTrace(); + } + return null; + } + } } diff --git a/app/src/main/java/monnethic/mobile/restApi/Config.java b/app/src/main/java/monnethic/mobile/restApi/Config.java index 0b24fc8..f2df96c 100644 --- a/app/src/main/java/monnethic/mobile/restApi/Config.java +++ b/app/src/main/java/monnethic/mobile/restApi/Config.java @@ -25,11 +25,10 @@ public class Config { //TRANSACTION static public String TRANSACTION_SEND = BASE_URL_TRANSACTION+"send"; static public String TRANSACTION_GET = BASE_URL_TRANSACTION+"get"; - static public String TRANSACTION_LATEST = BASE_URL_TRANSACTION+"/get/latest"; - static public String TRANSACTION_ALL = BASE_URL_TRANSACTION+"getAll"; - static public String TRANSACTION_SENT = BASE_URL_TRANSACTION+"sent"; - static public String TRANSACTION_RECEIVED = BASE_URL_TRANSACTION+"received"; - static public String TRANSACTION_SAVE = BASE_URL_TRANSACTION+"save"; + static public String TRANSACTION_LATEST = BASE_URL_TRANSACTION+"get/latest"; + static public String TRANSACTION_ALL = BASE_URL_TRANSACTION+"getTransactions"; + static public String TRANSACTION_SENT = BASE_URL_TRANSACTION+"get/sent"; + static public String TRANSACTION_RECEIVED = BASE_URL_TRANSACTION+"get/received"; //WALLET static public String WALLET_CREATE = BASE_URL_WALLET+"create"; diff --git a/app/src/main/java/monnethic/mobile/restApi/TransactionApiHandler.java b/app/src/main/java/monnethic/mobile/restApi/TransactionApiHandler.java index 30f9481..156a873 100644 --- a/app/src/main/java/monnethic/mobile/restApi/TransactionApiHandler.java +++ b/app/src/main/java/monnethic/mobile/restApi/TransactionApiHandler.java @@ -32,13 +32,18 @@ public class TransactionApiHandler { return ""; } - public ArrayList getTransactions(String url, String wallet_hash){ + public ArrayList getTransactions(String function, String url, String wallet_hash, + String size, String start_date, String end_date){ ArrayList transactionsList = new ArrayList<>(); HttpCallHandler httpCallHandler = new HttpCallHandler(); try{ - url = url+"?wallet_hash="+wallet_hash; - - + if(Integer.parseInt(function)==0){ + url = url+"?wallet_hash="+wallet_hash; + } else if(Integer.parseInt(function)==1 || Integer.parseInt(function)==2 || Integer.parseInt(function)==3){ + url = url+"?size="+size+"&wallet_hash="+wallet_hash; + } else { + url = url+"?size="+size+"&wallet_hash="+wallet_hash+"&start_date="+start_date+"&end_date="+end_date; + } String response = httpCallHandler.getHttp(new URL(url)); JSONArray jsonArray = new JSONArray(response);