Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Release 1.6.7.1

This commit is contained in:
stom79 2017-12-16 18:23:18 +01:00
parent 574be80e69
commit 5c8f10f806
3 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -7,8 +7,8 @@ android {
applicationId "fr.gouv.etalab.mastodon" applicationId "fr.gouv.etalab.mastodon"
minSdkVersion 15 minSdkVersion 15
targetSdkVersion 27 targetSdkVersion 27
versionCode 92 versionCode 93
versionName "1.6.7.1" versionName "1.6.7.2"
} }
flavorDimensions "default" flavorDimensions "default"

6
app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Version.java
View File

@ -17,10 +17,12 @@ public class Version implements Comparable<Version> {
public Version(String version) { public Version(String version) {
if(version == null) if(version == null)
version = "2.0"; version = "2.1";
if( version.endsWith("."))
version = version.substring(0, version.length() - 1);
version = version.replaceAll("[^\\d.]", ""); version = version.replaceAll("[^\\d.]", "");
if(!version.matches("[0-9]+(\\.[0-9]+)*")) if(!version.matches("[0-9]+(\\.[0-9]+)*"))
version = "2.0"; version = "2.1";
this.version = version; this.version = version;
} }

7
app/src/main/java/fr/gouv/etalab/mastodon/drawers/AccountsInAListAdapter.java
View File

@ -89,13 +89,6 @@ public class AccountsInAListAdapter extends RecyclerView.Adapter implements OnLi
//Profile picture //Profile picture
Helper.loadGiF(context, account.getAvatar(), holder.account_pp); 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){ if( actionType == type.CURRENT){
holder.account_action.setImageResource(R.drawable.ic_close); holder.account_action.setImageResource(R.drawable.ic_close);
}else if(actionType == type.SEARCH){ }else if(actionType == type.SEARCH){