diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/AboutActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/AboutActivity.java index 0c5e78083..d5ea7e75a 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/AboutActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/AboutActivity.java @@ -149,7 +149,7 @@ public class AboutActivity extends AppCompatActivity implements OnRetrieveRemote @Override - public void onRetrieveRemoteAccount(boolean error, String name, String username, String instance_name, boolean locked, String avatar, String bio, int statusCount, int followingCount, int followersCount) { + public void onRetrieveRemoteAccount(boolean error, String name, String username, String instance_name, boolean locked, String avatar, String bio, String statusCount, String followingCount, String followersCount) { if( error){ return; } @@ -158,9 +158,9 @@ public class AboutActivity extends AppCompatActivity implements OnRetrieveRemote account.setAcct(username + "@" + instance_name); account.setAvatar(avatar); account.setDisplay_name(username); - account.setStatuses_count(statusCount); - account.setFollowers_count(followersCount); - account.setFollowing_count(followingCount); + account.setStatuses_count_str(statusCount); + account.setFollowers_count_str(followersCount); + account.setFollowing_count_str(followingCount); account.setUsername(name); account.setLocked(locked); account.setNote(bio); diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/RemoteFollowActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/RemoteFollowActivity.java index 3047deb47..5e626391c 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/RemoteFollowActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/RemoteFollowActivity.java @@ -261,7 +261,7 @@ public class RemoteFollowActivity extends AppCompatActivity implements OnRetriev @Override - public void onRetrieveRemoteAccount(boolean error, String name, String username, String instance_name, boolean locked, String avatar, String bio, int statusCount, int followingCount, int followersCount) { + public void onRetrieveRemoteAccount(boolean error, String name, String username, String instance_name, boolean locked, String avatar, String bio, String statusCount, String followingCount, String followersCount) { loader.setVisibility(View.GONE); rf_search.setEnabled(true); if( error){ @@ -274,9 +274,9 @@ public class RemoteFollowActivity extends AppCompatActivity implements OnRetriev account.setAcct(screen_name + "@" + instance_name); account.setAvatar(avatar); account.setDisplay_name(username); - account.setStatuses_count(statusCount); - account.setFollowers_count(followersCount); - account.setFollowing_count(followingCount); + account.setStatuses_count_str(statusCount); + account.setFollowers_count_str(followersCount); + account.setFollowing_count_str(followingCount); account.setUsername(name); account.setLocked(locked); account.setNote(bio); diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveRemoteAccountsAsyncTask.java b/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveRemoteAccountsAsyncTask.java index 2e3bfec6f..f8b2ef714 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveRemoteAccountsAsyncTask.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveRemoteAccountsAsyncTask.java @@ -33,7 +33,7 @@ public class RetrieveRemoteAccountsAsyncTask extends AsyncTask private OnRetrieveRemoteAccountInterface listener; private String url; private String avatar, name, username, bio; - private int statusCount, followingCount, followersCount; + private String statusCount, followingCount, followersCount; private boolean islocked; private boolean error = false; private String instance; @@ -62,9 +62,9 @@ public class RetrieveRemoteAccountsAsyncTask extends AsyncTask Elements bioElement = document.getElementsByClass("bio"); bio = bioElement.get(0).html(); Elements countElement = document.getElementsByClass("counter-number"); - statusCount = Integer.parseInt(countElement.get(0).html().replace(",","")); - followingCount = Integer.parseInt(countElement.get(1).html().replace(",","")); - followersCount = Integer.parseInt(countElement.get(2).html().replace(",","")); + statusCount = countElement.get(0).html(); + followingCount = countElement.get(1).html(); + followersCount = countElement.get(2).html(); } catch (Exception e) { error = true; e.printStackTrace(); diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Account.java b/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Account.java index 85bf71f83..a587a3e63 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Account.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Account.java @@ -35,6 +35,9 @@ public class Account implements Parcelable { private int followers_count; private int following_count; private int statuses_count; + private String followers_count_str; + private String following_count_str; + private String statuses_count_str; private String note; private String url; private String avatar; @@ -255,4 +258,28 @@ public class Account implements Parcelable { public void setRemote(boolean remote) { isRemote = remote; } + + public String getFollowers_count_str() { + return followers_count_str; + } + + public void setFollowers_count_str(String followers_count_str) { + this.followers_count_str = followers_count_str; + } + + public String getFollowing_count_str() { + return following_count_str; + } + + public void setFollowing_count_str(String following_count_str) { + this.following_count_str = following_count_str; + } + + public String getStatuses_count_str() { + return statuses_count_str; + } + + public void setStatuses_count_str(String statuses_count_str) { + this.statuses_count_str = statuses_count_str; + } } diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/AccountSearchWebAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/AccountSearchWebAdapter.java index d29923a48..44decec34 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/AccountSearchWebAdapter.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/AccountSearchWebAdapter.java @@ -143,9 +143,9 @@ public class AccountSearchWebAdapter extends BaseAdapter implements OnPostAction } changeDrawableColor(context, R.drawable.ic_action_lock_closed,R.color.mastodonC4); holder.account_ds.setAutoLinkMask(Linkify.WEB_URLS); - holder.account_sc.setText(String.valueOf(account.getStatuses_count())); - holder.account_fgc.setText(String.valueOf(account.getFollowing_count())); - holder.account_frc.setText(String.valueOf(account.getFollowers_count())); + holder.account_sc.setText(String.valueOf(account.getStatuses_count_str())); + holder.account_fgc.setText(String.valueOf(account.getFollowing_count_str())); + holder.account_frc.setText(String.valueOf(account.getFollowers_count_str())); //Profile picture imageLoader.displayImage(account.getAvatar(), holder.account_pp, options); diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnRetrieveRemoteAccountInterface.java b/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnRetrieveRemoteAccountInterface.java index 4388e231d..200e7f3e0 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnRetrieveRemoteAccountInterface.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/interfaces/OnRetrieveRemoteAccountInterface.java @@ -20,5 +20,5 @@ package fr.gouv.etalab.mastodon.interfaces; * Interface for retrieving a remote account */ public interface OnRetrieveRemoteAccountInterface { - void onRetrieveRemoteAccount(boolean error, String name, String username, String instance, boolean locked, String avatar, String bio, int statusCount, int followingCount, int followersCount); + void onRetrieveRemoteAccount(boolean error, String name, String username, String instance, boolean locked, String avatar, String bio, String statusCount, String followingCount, String followersCount); } diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/services/StreamingService.java b/app/src/main/java/fr/gouv/etalab/mastodon/services/StreamingService.java index ac8365a81..6c26e9683 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/services/StreamingService.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/services/StreamingService.java @@ -220,7 +220,6 @@ public class StreamingService extends Service { } if (event !=null){ if( (lastEvent == EventStreaming.NONE || lastEvent == null) && !event.startsWith("data: ")) { - switch (event.trim()) { case "event: update": lastEvent = EventStreaming.UPDATE;