diff --git a/app/build.gradle b/app/build.gradle index b549bff4f..110820407 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,8 +7,8 @@ android { applicationId "fr.gouv.etalab.mastodon" minSdkVersion 15 targetSdkVersion 27 - versionCode 92 - versionName "1.6.7.1" + versionCode 93 + versionName "1.6.7.2" } flavorDimensions "default" diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Version.java b/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Version.java index d2b185ce5..59aacf32d 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Version.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Version.java @@ -17,10 +17,12 @@ public class Version implements Comparable { public Version(String version) { if(version == null) - version = "2.0"; + version = "2.1"; + if( version.endsWith(".")) + version = version.substring(0, version.length() - 1); version = version.replaceAll("[^\\d.]", ""); if(!version.matches("[0-9]+(\\.[0-9]+)*")) - version = "2.0"; + version = "2.1"; this.version = version; } diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/AccountsInAListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/AccountsInAListAdapter.java index 3e9e2da35..ca2a21c08 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/AccountsInAListAdapter.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/AccountsInAListAdapter.java @@ -89,13 +89,6 @@ public class AccountsInAListAdapter extends RecyclerView.Adapter implements OnLi //Profile picture Helper.loadGiF(context, account.getAvatar(), holder.account_pp); - //Follow button - holder.account_action.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - - } - }); if( actionType == type.CURRENT){ holder.account_action.setImageResource(R.drawable.ic_close); }else if(actionType == type.SEARCH){