From c8b64f7e53526595efe4d2fbdde75917d627affc Mon Sep 17 00:00:00 2001 From: Pierre Date: Sun, 12 Nov 2017 14:54:17 +0100 Subject: [PATCH] Reverted modifications --- .../client/data/UsersInfo/GetUsersInfos.java | 113 ++++++++---------- .../client/fragments/UserInfosFragment.java | 10 +- 2 files changed, 54 insertions(+), 69 deletions(-) diff --git a/app/src/main/java/org/communiquons/android/comunic/client/data/UsersInfo/GetUsersInfos.java b/app/src/main/java/org/communiquons/android/comunic/client/data/UsersInfo/GetUsersInfos.java index 5f222f2..c64797a 100644 --- a/app/src/main/java/org/communiquons/android/comunic/client/data/UsersInfo/GetUsersInfos.java +++ b/app/src/main/java/org/communiquons/android/comunic/client/data/UsersInfo/GetUsersInfos.java @@ -1,8 +1,6 @@ package org.communiquons.android.comunic.client.data.UsersInfo; import android.content.Context; -import android.os.AsyncTask; -import android.util.Log; import org.communiquons.android.comunic.client.api.APIRequestParameters; import org.communiquons.android.comunic.client.api.APIRequestTask; @@ -11,8 +9,6 @@ import org.communiquons.android.comunic.client.data.DatabaseHelper; import org.json.JSONException; import org.json.JSONObject; -import java.util.concurrent.ExecutionException; - /** * This class handles informations requests about user informations * @@ -20,7 +16,7 @@ import java.util.concurrent.ExecutionException; * Created by pierre on 11/5/17. */ -public abstract class GetUsersInfos extends AsyncTask { +public class GetUsersInfos { /** * User informations database helper @@ -32,22 +28,13 @@ public abstract class GetUsersInfos extends AsyncTask { */ private Context context; - /** - * UserID to retrieve - */ - private int id; - /** * Public constructor * - * @param id The ID of the user to get the information about * @param context The context of the application * @param dbHelper Database helper object */ - public GetUsersInfos(int id, Context context, DatabaseHelper dbHelper){ - - //Save user ID - this.id = id; + public GetUsersInfos(Context context, DatabaseHelper dbHelper){ //Save context this.context = context; @@ -58,38 +45,50 @@ public abstract class GetUsersInfos extends AsyncTask { } /** - * Each script must implement specifically what will be done once the request is done - * - * @param info Informations about the user / null in case of failure + * This interface must be implemented to perform an API request */ - @Override - abstract protected void onPostExecute(UserInfo info); + public interface getUserInfosCallback{ + + /** + * Callback function called when we got informations about user + * + * @param info Information about the user + */ + void callback(UserInfo info); + + } /** - * Get and return information about a user + * Get and return informations about a user + * + * @param id The ID of the user to get the informations + * @param callback What to do once we got the response */ - @Override - protected UserInfo doInBackground(Void... params) { + public void get(int id, getUserInfosCallback callback){ //Check if the ID is positive, error else - if(id < 1) - return null; + if(id < 1){ + callback.callback(null); //This is an error + } //Check if the user is already present in the database or not if(!udbHelper.exists(id)) //Perform a request on the server - return getOnServer(id); + getOnServer(id, callback); + + //Else we can retrieve user informations from the local database else - //Return the cached values about the user - return udbHelper.get(id); + callback.callback(udbHelper.get(id)); + } /** * Get and return the informations about a user on the server * * @param id The ID of the user to get informations from + * @param callback What to do once the request is done */ - private UserInfo getOnServer(int id){ + private void getOnServer(final int id, final getUserInfosCallback callback){ //Perform a request on the API server //Setup the request @@ -97,58 +96,48 @@ public abstract class GetUsersInfos extends AsyncTask { requestParameters.addParameter("userID", ""+id); //Do it. - APIRequestTask req = new APIRequestTask(){ + new APIRequestTask(){ @Override protected void onPostExecute(APIResponse result) { - //Nothing - } - }; - req.execute(requestParameters); + UserInfo userInfos = null; - //Get the result and process it when it becomes available - try { - APIResponse result = req.get(); - UserInfo userInfos = null; - Log.v("GetUsersInfos", "test2 test test"); + try { + if(result != null) { - try { - if(result != null) { + //Try to extract user informations + JSONObject userObjectContainer = result.getJSONObject(); - //Try to extract user informations - JSONObject userObjectContainer = result.getJSONObject(); + if (userObjectContainer != null) { - if (userObjectContainer != null) { + //Extract user object + JSONObject userObject = userObjectContainer.getJSONObject("" + id); - //Extract user object - JSONObject userObject = userObjectContainer.getJSONObject("" + id); + //Continue only if we could extract required informations + if (userObject != null) { + //Parse user informations + userInfos = parse_user_json(userObject); + } - //Continue only if we could extract required informations - if (userObject != null) { - //Parse user informations - userInfos = parse_user_json(userObject); + //Save user information in the local database in case of success + if (userInfos != null) + udbHelper.insertOrUpdate(userInfos); } - //Save user information in the local database in case of success - if (userInfos != null) - udbHelper.insertOrUpdate(userInfos); } + } catch (JSONException e){ + e.printStackTrace(); } - } catch (JSONException e){ - e.printStackTrace(); + //Go to the next function + callback.callback(userInfos); + } - return userInfos; + }.execute(requestParameters); - } catch (Exception e){ - e.printStackTrace(); - - //Failure - return null; - } } /** diff --git a/app/src/main/java/org/communiquons/android/comunic/client/fragments/UserInfosFragment.java b/app/src/main/java/org/communiquons/android/comunic/client/fragments/UserInfosFragment.java index 27a4482..63850e8 100644 --- a/app/src/main/java/org/communiquons/android/comunic/client/fragments/UserInfosFragment.java +++ b/app/src/main/java/org/communiquons/android/comunic/client/fragments/UserInfosFragment.java @@ -5,7 +5,6 @@ import android.app.Fragment; import android.content.Context; import android.os.Bundle; import android.support.annotation.Nullable; -import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -59,12 +58,9 @@ public class UserInfosFragment extends Fragment { //Retrieve user informations in order to display them int user_id = new AccountUtils(mContext).get_current_user_id(); - new GetUsersInfos(user_id, mContext, dbHelper){ + new GetUsersInfos(mContext, dbHelper).get(user_id, new GetUsersInfos.getUserInfosCallback() { @Override - protected void onPostExecute(UserInfo info) { - - if(info != null) - return; + public void callback(UserInfo info) { //Set the name of the user userNameView.setText(info.getFullName()); @@ -72,7 +68,7 @@ public class UserInfosFragment extends Fragment { //Get and show the user account image new ImageLoadTask(mContext, info.getAcountImageURL(), imageView).execute(); } - }.execute(); + }); return result; }