From 961519e6f505b531a1df300f5d3c5479428defec Mon Sep 17 00:00:00 2001 From: GME Date: Mon, 26 Nov 2018 19:49:33 +0100 Subject: [PATCH] test and connection to API Register and Login with query balance for user Hash --- .idea/caches/build_file_checksums.ser | Bin 535 -> 541 bytes .../mobile/homepage/RegisterActivity.java | 1 + .../java/monnethic/mobile/restApi/Config.java | 2 +- .../mobile/user/UserAccountActivity.java | 23 ++++++++++++------ .../main/res/layout/activity_user_account.xml | 7 ++++-- 5 files changed, 22 insertions(+), 11 deletions(-) diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index aaba8ebbe85558fa71960686090ca0063d1c12f2..d6554093950a04d95902349a0a800938a007c927 100644 GIT binary patch delta 70 zcmV-M0J;B{1f2wsm;_NL;2@ElwG%8uI$TwAWpZ;|M|EjzY+-e6Ws|f4Hj_~SL=(vl ch#G3t@~&-IHhg db6iJFMO-dta$#g_Wn7c-0UMKu0TPq&0WA#L8`b~- diff --git a/app/src/main/java/monnethic/mobile/homepage/RegisterActivity.java b/app/src/main/java/monnethic/mobile/homepage/RegisterActivity.java index 010aa0c..3edb535 100644 --- a/app/src/main/java/monnethic/mobile/homepage/RegisterActivity.java +++ b/app/src/main/java/monnethic/mobile/homepage/RegisterActivity.java @@ -113,6 +113,7 @@ public class RegisterActivity extends AppCompatActivity { try{ if(result!=null){ if(result.getInt("status") == 200){ + System.out.println(result); Intent accountIntent = new Intent(RegisterActivity.this, UserAccountActivity.class); accountIntent.putExtra("userHash", result.getString("userHash")); RegisterActivity.this.startActivity(accountIntent); diff --git a/app/src/main/java/monnethic/mobile/restApi/Config.java b/app/src/main/java/monnethic/mobile/restApi/Config.java index 4485d14..3a17cf7 100644 --- a/app/src/main/java/monnethic/mobile/restApi/Config.java +++ b/app/src/main/java/monnethic/mobile/restApi/Config.java @@ -24,5 +24,5 @@ public class Config { //BLOCKCHAIN static private String BASE_URL_QUERY = BASE_URL+"/api/rest/query/"; - static public String QUERY_BALANCE = BASE_URL_QUERY+"/balance?name="; + static public String QUERY_BALANCE = BASE_URL_QUERY+"/balance?userHash="; } \ No newline at end of file diff --git a/app/src/main/java/monnethic/mobile/user/UserAccountActivity.java b/app/src/main/java/monnethic/mobile/user/UserAccountActivity.java index ce9f348..2c8b5ec 100644 --- a/app/src/main/java/monnethic/mobile/user/UserAccountActivity.java +++ b/app/src/main/java/monnethic/mobile/user/UserAccountActivity.java @@ -6,6 +6,7 @@ import android.support.v7.app.AppCompatActivity; import android.os.Bundle; import android.view.View; import android.widget.Button; +import android.widget.EditText; import android.widget.TextView; import android.widget.Toast; @@ -26,10 +27,7 @@ import monnethic.mobile.transaction.MakePayementActivity; import monnethic.mobile.transaction.ReceivePayementActivity; public class UserAccountActivity extends AppCompatActivity { - private TextView balance; - private String strUrl = Config.QUERY_BALANCE; - private String result; @Override protected void onCreate(Bundle savedInstanceState) { @@ -41,7 +39,6 @@ public class UserAccountActivity extends AppCompatActivity { Button buttonReceive = findViewById(R.id.buttonReceive); Button buttonSettings = findViewById(R.id.buttonSettings); Button buttonRefresh = findViewById(R.id.buttonRefreshBalance); - Intent intent = getIntent(); String userHash = intent.getStringExtra("userHash"); userHashView.setText(userHash); @@ -71,7 +68,7 @@ public class UserAccountActivity extends AppCompatActivity { } }); - String[] params = {strUrl,"b"}; + String[] params = {userHash}; new GetUserBalanceTask().execute(params); } @@ -106,7 +103,12 @@ public class UserAccountActivity extends AppCompatActivity { @Override protected void onPostExecute(String s) { - balance.setText(s); + if(s!=null){ + balance.setText(s); + }else{ + balance.setText("0"); + } + } @Override @@ -115,8 +117,13 @@ public class UserAccountActivity extends AppCompatActivity { String url = Config.QUERY_BALANCE+params[0]; HttpCallHandler httpCallHandler = new HttpCallHandler(); JSONObject json = new JSONObject(httpCallHandler.executeGetBalance(url)); - Double balance = json.getDouble("userBalance"); - return balance.toString(); + if(json.get("userBalance")!=null){ + Double balance = json.getDouble("userBalance"); + return balance.toString(); + }else{ + return null; + } + } catch (Exception e){ e.printStackTrace(); return null; diff --git a/app/src/main/res/layout/activity_user_account.xml b/app/src/main/res/layout/activity_user_account.xml index 4bd8f9b..80f596e 100644 --- a/app/src/main/res/layout/activity_user_account.xml +++ b/app/src/main/res/layout/activity_user_account.xml @@ -59,6 +59,7 @@