From 5c739d499a23894eed6ec59c0c57f0da43f7b892 Mon Sep 17 00:00:00 2001
From: tom79 <tschneider.ac@gmail.com>
Date: Tue, 17 Oct 2017 19:20:56 +0200
Subject: [PATCH] Moves my account to mastodon.social

---
 .../fr/gouv/etalab/mastodon/activities/AboutActivity.java     | 4 ++--
 .../asynctasks/RetrieveDeveloperAccountsAsyncTask.java        | 2 +-
 app/src/main/res/values-de/strings.xml                        | 1 -
 app/src/main/res/values-fr/strings.xml                        | 1 -
 app/src/main/res/values-nl/strings.xml                        | 1 -
 app/src/main/res/values-pt/strings.xml                        | 1 -
 app/src/main/res/values/strings.xml                           | 2 +-
 7 files changed, 4 insertions(+), 8 deletions(-)

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 e005048bf..187939e7d 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
@@ -153,7 +153,7 @@ public class AboutActivity extends AppCompatActivity implements OnRetrieveRemote
         accountSearchWebAdapterDeveloper = new AccountSearchDevAdapter(AboutActivity.this, developers);
         lv_developers.setAdapter(accountSearchWebAdapterDeveloper);
 
-        new RetrieveRemoteAccountsAsyncTask(getApplicationContext(), "tschneider", "mastodon.etalab.gouv.fr", AboutActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+        new RetrieveRemoteAccountsAsyncTask(getApplicationContext(), "tom79", "mastodon.social", AboutActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
         new RetrieveRemoteAccountsAsyncTask(getApplicationContext(), "daycode", "mastodon.social", AboutActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
         new RetrieveRemoteAccountsAsyncTask(getApplicationContext(), "PhotonQyv", "mastodon.xyz", AboutActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
         new RetrieveRemoteAccountsAsyncTask(getApplicationContext(), "angrytux", "social.tchncs.de", AboutActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
@@ -187,7 +187,7 @@ public class AboutActivity extends AppCompatActivity implements OnRetrieveRemote
             account = accounts.get(0);
             account.setFollowing(true);
             switch (account.getUsername()) {
-                case "tschneider":
+                case "tom79":
                     developers.add(account);
                     accountSearchWebAdapterDeveloper.notifyDataSetChanged();
                     break;
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveDeveloperAccountsAsyncTask.java b/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveDeveloperAccountsAsyncTask.java
index af8ad4044..01458bf19 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveDeveloperAccountsAsyncTask.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/RetrieveDeveloperAccountsAsyncTask.java
@@ -45,7 +45,7 @@ public class RetrieveDeveloperAccountsAsyncTask extends AsyncTask<Void, Void, Vo
     protected Void doInBackground(Void... params) {
         API api = new API(context);
         accounts = new ArrayList<>();
-        APIResponse apiResponse = api.searchAccounts("@tschneider@mastodon.etalab.gouv.fr", 1);
+        APIResponse apiResponse = api.searchAccounts("@tom79@mastodon.social", 1);
         if( apiResponse.getAccounts() != null && apiResponse.getAccounts().size() > 0)
             accounts.add(apiResponse.getAccounts().get(0));
         apiResponse = api.searchAccounts("@daycode@mastodon.social",1);
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 5fef7c9d2..2c0d18834 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -193,7 +193,6 @@
     <!-- About -->
     <string name="about_vesrion">Version %1$s</string>
     <string name="about_developer">Entwickler:</string>
-    <string name="about_developer_action">\\@tschneider</string>
     <string name="about_license">Lizenz:</string>
     <string name="about_license_action">GNU GPL V3</string>
     <string name="about_code">Quellcode:</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index c8dfa30bb..c7c4c65c7 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -189,7 +189,6 @@
     <!-- About -->
     <string name="about_vesrion">Version %1$s</string>
     <string name="about_developer">Développeur :</string>
-    <string name="about_developer_action">\@tschneider</string>
     <string name="about_license">Licence : </string>
     <string name="about_license_action">GNU GPL V3</string>
     <string name="about_code">Code source : </string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index a27f3bd66..0168ce138 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -190,7 +190,6 @@
     <!-- About -->
     <string name="about_vesrion">Release %1$s</string>
     <string name="about_developer">Ontwikkelaar:</string>
-    <string name="about_developer_action">\@tschneider</string>
     <string name="about_license">Licentie: </string>
     <string name="about_license_action">GNU GPL V3</string>
     <string name="about_code">Broncode: </string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index e62b7e29f..4a7335047 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -189,7 +189,6 @@
     <!-- About -->
     <string name="about_vesrion">Versão %1$s</string>
     <string name="about_developer">Desenvolvedor:</string>
-    <string name="about_developer_action">\@tschneider</string>
     <string name="about_license">Licença: </string>
     <string name="about_license_action">GNU GPL V3</string>
     <string name="about_code">Código-fonte: </string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c59acdb76..0ab699d97 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -190,7 +190,7 @@
     <!-- About -->
     <string name="about_vesrion">Release %1$s</string>
     <string name="about_developer">Developer:</string>
-    <string name="about_developer_action">\@tschneider</string>
+    <string name="about_developer_action" translatable="false">\@tom79</string>
     <string name="about_license">License: </string>
     <string name="about_license_action">GNU GPL V3</string>
     <string name="about_code">Source code: </string>