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

Fixes issue with instance version

This commit is contained in:
stom79 2017-11-03 15:20:50 +01:00
parent 4c2c3880f3
commit d4e222cfcd
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java
View File

@ -47,7 +47,6 @@ import android.text.InputFilter;
import android.text.InputType; import android.text.InputType;
import android.text.SpannableString; import android.text.SpannableString;
import android.text.TextWatcher; import android.text.TextWatcher;
import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;
@ -1100,7 +1099,9 @@ public class TootActivity extends AppCompatActivity implements OnRetrieveSearcAc
itemViewReply.setVisible(false); itemViewReply.setVisible(false);
} }
SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE); SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
String instanceVersion = sharedpreferences.getString(Helper.INSTANCE_VERSION, null); String instance = Helper.getLiveInstance(getApplicationContext());
String userId = sharedpreferences.getString(Helper.PREF_KEY_ID, null);
String instanceVersion = sharedpreferences.getString(Helper.INSTANCE_VERSION + userId + instance, null);
Version currentVersion = new Version(instanceVersion); Version currentVersion = new Version(instanceVersion);
Version minVersion = new Version("2.0"); Version minVersion = new Version("2.0");
MenuItem itemEmoji = menu.findItem(R.id.action_emoji); MenuItem itemEmoji = menu.findItem(R.id.action_emoji);
@ -1181,7 +1182,6 @@ public class TootActivity extends AppCompatActivity implements OnRetrieveSearcAc
String instance = Helper.getLiveInstance(getApplicationContext()); String instance = Helper.getLiveInstance(getApplicationContext());
String userId = sharedpreferences.getString(Helper.PREF_KEY_ID, null); String userId = sharedpreferences.getString(Helper.PREF_KEY_ID, null);
String instanceVersion = sharedpreferences.getString(Helper.INSTANCE_VERSION + userId + instance, null); String instanceVersion = sharedpreferences.getString(Helper.INSTANCE_VERSION + userId + instance, null);
Log.v(Helper.TAG,"instance: " + instanceVersion);
if (instanceVersion != null) { if (instanceVersion != null) {
Version currentVersion = new Version(instanceVersion); Version currentVersion = new Version(instanceVersion);
Version minVersion = new Version("2.0"); Version minVersion = new Version("2.0");

1
app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
View File

@ -42,7 +42,6 @@ import android.text.SpannableString;
import android.text.Spanned; import android.text.Spanned;
import android.text.method.LinkMovementMethod; import android.text.method.LinkMovementMethod;
import android.text.style.ForegroundColorSpan; import android.text.style.ForegroundColorSpan;
import android.util.Log;
import android.util.TypedValue; import android.util.TypedValue;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.MenuItem; import android.view.MenuItem;