diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientdetails/ClientDetailsFragment.java b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientdetails/ClientDetailsFragment.java index 92dac9c655d..a902cda3243 100755 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientdetails/ClientDetailsFragment.java +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/clientdetails/ClientDetailsFragment.java @@ -405,7 +405,7 @@ public void showClientInformation(Client client) { rowExternal.setVisibility(GONE); try { - String dateString = Utils.getStringOfDate(getActivity(), + String dateString = Utils.getStringOfDate( client.getActivationDate()); tv_activationDate.setText(dateString); diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/groupdetails/GroupDetailsFragment.java b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/groupdetails/GroupDetailsFragment.java index 5cf13e71c3b..b38b9acccbe 100644 --- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/groupdetails/GroupDetailsFragment.java +++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/groupdetails/GroupDetailsFragment.java @@ -198,7 +198,7 @@ public void showGroup(Group group) { tv_externalId.setText(group.getExternalId()); try { - String dateString = Utils.getStringOfDate(getActivity(), group.getActivationDate()); + String dateString = Utils.getStringOfDate(group.getActivationDate()); tv_activationDate.setText(dateString); if (TextUtils.isEmpty(dateString)) diff --git a/mifosng-android/src/main/java/com/mifos/utils/Utils.java b/mifosng-android/src/main/java/com/mifos/utils/Utils.java index 1d35a6de8f5..e04c7b8764d 100644 --- a/mifosng-android/src/main/java/com/mifos/utils/Utils.java +++ b/mifosng-android/src/main/java/com/mifos/utils/Utils.java @@ -13,11 +13,10 @@ import com.mifos.objects.accounts.savings.SavingsAccount; import java.text.DateFormat; -import java.text.ParseException; -import java.text.SimpleDateFormat; import java.util.ArrayList; -import java.util.Date; +import java.util.Calendar; import java.util.List; +import java.util.TimeZone; import rx.Observable; import rx.functions.Action1; @@ -125,21 +124,19 @@ public void call(SavingsAccount savingsAccount) { /** * This Method Converting the List of Activation Date to String. * - * @param context Context * @param dateObj List of Date * @return */ - public static String getStringOfDate(Context context, List dateObj) { - SimpleDateFormat simpleDateFormat = new SimpleDateFormat("dd MMM yyyy", - context.getResources().getConfiguration().locale); - Date date = null; - try { - date = simpleDateFormat.parse(DateHelper.getDateAsString(dateObj)); - } catch (ParseException e) { - Log.d(LOG_TAG, e.getLocalizedMessage()); - } + public static String getStringOfDate(List dateObj) { + Calendar calendar = Calendar.getInstance(); + calendar.setTimeZone(TimeZone.getTimeZone("UTC")); + calendar.set(Calendar.YEAR, dateObj.get(0)); + //in Calendar months are indexed from 0 to 11 + calendar.set(Calendar.MONTH, dateObj.get(1) - 1); + calendar.set(Calendar.DAY_OF_MONTH, dateObj.get(2)); + DateFormat df = DateFormat.getDateInstance(DateFormat.MEDIUM); - return df.format(date); + return df.format(calendar.getTime()); } public static LayerDrawable setCircularBackground(int colorId, Context context) { @@ -148,4 +145,4 @@ public static LayerDrawable setCircularBackground(int colorId, Context context) LayerDrawable ld = new LayerDrawable(new Drawable[]{image, color}); return ld; } -} \ No newline at end of file +}