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

Improve follow instance in profile

This commit is contained in:
stom79 2018-09-01 09:46:10 +02:00
parent 4e3387e214
commit e8d79db43f
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -42,7 +42,7 @@ allprojects {
}
}
ext.supportLibraryVersion = '27.1.1'
ext.glideLibraryVersion = '4.6.1'
ext.glideLibraryVersion = '4.8.0'
ext.conscryptLibraryVersion = '1.2.0'
ext.evernoteLibraryVersion = '1.3.0-alpha06'
ext.gsonLibraryVersion = '2.8.2'

15
app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java
View File

@ -98,6 +98,9 @@ import fr.gouv.etalab.mastodon.sqlite.InstancesDAO;
import fr.gouv.etalab.mastodon.sqlite.Sqlite;
import fr.gouv.etalab.mastodon.sqlite.TempMuteDAO;
import static fr.gouv.etalab.mastodon.helper.Helper.INSTANCE_NAME;
import static fr.gouv.etalab.mastodon.helper.Helper.INTENT_ACTION;
import static fr.gouv.etalab.mastodon.helper.Helper.SEARCH_INSTANCE;
import static fr.gouv.etalab.mastodon.helper.Helper.THEME_BLACK;
import static fr.gouv.etalab.mastodon.helper.Helper.THEME_DARK;
import static fr.gouv.etalab.mastodon.helper.Helper.changeDrawableColor;
@ -334,6 +337,12 @@ public class ShowAccountActivity extends BaseActivity implements OnPostActionInt
List<String> instance = new InstancesDAO(ShowAccountActivity.this, db).getInstanceByName(finalInstanceName);
if( instance != null && instance.size() > 0 ){
Toast.makeText(getApplicationContext(), R.string.toast_instance_already_added,Toast.LENGTH_LONG).show();
Intent intent = new Intent(getApplicationContext(), InstanceFederatedActivity.class);
Bundle bundle = new Bundle();
bundle.putInt(INTENT_ACTION, SEARCH_INSTANCE);
bundle.putString(INSTANCE_NAME,finalInstanceName);
intent.putExtras(bundle);
startActivity(intent);
return true;
}
new Thread(new Runnable(){
@ -346,6 +355,12 @@ public class ShowAccountActivity extends BaseActivity implements OnPostActionInt
final SQLiteDatabase db = Sqlite.getInstance(getApplicationContext(), Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
new InstancesDAO(ShowAccountActivity.this, db).insertInstance(finalInstanceName);
Toast.makeText(getApplicationContext(), R.string.toast_instance_followed,Toast.LENGTH_LONG).show();
Intent intent = new Intent(getApplicationContext(), InstanceFederatedActivity.class);
Bundle bundle = new Bundle();
bundle.putInt(INTENT_ACTION, SEARCH_INSTANCE);
bundle.putString(INSTANCE_NAME,finalInstanceName);
intent.putExtras(bundle);
startActivity(intent);
}
});
} catch (final Exception e) {