information update, add akkoma

2023-06-23 01:01:21 +10:00 · 2023-06-23 01:01:21 +10:00 · 1ab8eb0aca
parent d51efa8b89
commit 1ab8eb0aca
18 changed files with 209 additions and 181 deletions
--- a/README.md
+++ b/README.md
@ -42,9 +42,9 @@ This app requires access to the Internet and to external storage to be able to u
 ---
 ### Contributors
 The project is always open for contributions and accepts pull requests.
-* Massimiliano
-* Muppeth
-* Antilopa
+* [Massimiliano](https://fe.disroot.org/@massimiliano)
+* [Muppeth](https://fe.disroot.org/@muppeth)
+* [Antilopa](https://fe.disroot.org/@antilopa)
 * Fede
 * Maryjane
 * Meaz
@ -53,7 +53,7 @@ The project is always open for contributions and accepts pull requests.
 ---
 ### Resources
 * DisApp: [Bugs & Issues](https://git.disroot.org/Disroot/disapp/issues)
-* Disroot Project: [Web](https://disroot.org) | [Git](https://git.disroot.org/Disroot) | [Hubzilla Channel](https://hub.disroot.org/channel/disroot)
+* Disroot Project: [Web](https://disroot.org) | [Git](https://git.disroot.org/Disroot)
 * F-Droid: [Disroot App](https://f-droid.org/en/packages/org.disroot.disrootapp/)

 ---
--- a/app/src/main/java/org/disroot/disrootapp/ui/MainActivity.java
+++ b/app/src/main/java/org/disroot/disrootapp/ui/MainActivity.java
@ -92,8 +92,8 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
    WebChromeClient.FileChooserParams chooserParams;
    ValueCallback<Uri[]> chooserPathUri;
    Button button;
-    private Button MailBtn,CloudBtn,ForumBtn,ChatBtn,PadBtn, CryptpadBtn,BinBtn,UploadBtn,SearxBtn,BoardBtn,CallsBtn,NotesBtn,GitBtn,UserBtn,StateBtn,HowToBtn,AboutBtn;//all buttons
-    private String email,cloud,forum,etherpad,bin,upload,searx,taiga,user,xmpp,notes,git,cryptpad;
+    private Button MailBtn,CloudBtn,ForumBtn,ChatBtn,PadBtn,CryptpadBtn,BinBtn,UploadBtn,SearxBtn,SocialBtn,CallsBtn,NotesBtn,GitBtn,UserBtn,StateBtn,HowToBtn,AboutBtn;//all buttons
+    private String email,cloud,forum,etherpad,bin,upload,searx,akkoma,user,xmpp,notes,git,cryptpad;
    private CookieManager cookieManager;
    private WebView webView;
    private DisWebChromeClient disWebChromeClient;
@ -161,7 +161,8 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
        BtnPreference = getSharedPreferences( "BinBtn", Context.MODE_PRIVATE );//bin
        BtnPreference = getSharedPreferences( "UploadBtn", Context.MODE_PRIVATE );//upload
        BtnPreference = getSharedPreferences( "SearxBtn", Context.MODE_PRIVATE );//search
-        BtnPreference = getSharedPreferences( "BoardBtn", Context.MODE_PRIVATE );//board
+        BtnPreference = getSharedPreferences( "SocialBtn", Context.MODE_PRIVATE );//search
+        /*BtnPreference = getSharedPreferences( "BoardBtn", Context.MODE_PRIVATE );//board*/
        BtnPreference = getSharedPreferences( "CallsBtn", Context.MODE_PRIVATE );//calls
        BtnPreference = getSharedPreferences( "NotesBtn", Context.MODE_PRIVATE );//notes
        BtnPreference = getSharedPreferences( "GitBtn", Context.MODE_PRIVATE );//git
@ -234,7 +235,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
        // Link the button in activity_main.xml
        MailBtn = findViewById( R.id.MailBtn );
        CloudBtn = findViewById( R.id.CloudBtn );
-        //DiasporaBtn = findViewById( R.id.DiasporaBtn );//end of Disroot's Dandelion
+        SocialBtn = findViewById( R.id.SocialBtn );
        ForumBtn = findViewById( R.id.ForumBtn );
        ChatBtn = findViewById( R.id.ChatBtn );
        PadBtn = findViewById( R.id.PadBtn );
@ -272,7 +273,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
        //Set longclick buttons
        MailBtn.setOnLongClickListener( this );
        CloudBtn.setOnLongClickListener( this );
-        //DiasporaBtn.setOnLongClickListener( this );//end of Disroot's Dandelion
+        SocialBtn.setOnLongClickListener( this );
        ForumBtn.setOnLongClickListener( this );
        ChatBtn.setOnLongClickListener( this );
        PadBtn.setOnLongClickListener( this );
@ -292,7 +293,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
        //set clickbuttons
        MailBtn.setOnClickListener( this );
        CloudBtn.setOnClickListener( this );
-        //DiasporaBtn.setOnClickListener( this );//end of Disroot's Dandelion
+        SocialBtn.setOnClickListener( this );
        ForumBtn.setOnClickListener( this );
        ChatBtn.setOnClickListener( this );
        PadBtn.setOnClickListener( this );
@ -329,7 +330,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
        else {
            switch (view.getId()) {
                case R.id.MailBtn:
-                    Intent mail = getPackageManager().getLaunchIntentForPackage( Constants.k9 );
+                    Intent mail = getPackageManager().getLaunchIntentForPackage(Constants.k9);
                    if (mail == null) {
                        showMailDialog();
                        break;
@ -337,20 +338,20 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
                    break;
                case R.id.CloudBtn:
                    Intent cloud = getPackageManager().getLaunchIntentForPackage(Constants.nc);
-                    if(cloud == null) {
+                    if(cloud == null) {buLOc0rw7gSAWdu3s4J9l
                        showCloudDialog();
                        break;
                    }
                    else startActivity(cloud);
                    break;
-                /*case R.id.DiasporaBtn: //end ofDisroot's Dandelion
-                        Intent pod = getPackageManager().getLaunchIntentForPackage(Diaspora);
-                        if(getPackageManager().getLaunchIntentForPackage(Diaspora) == null) {
-                            showDiaDialog();
-                            break;
-                        }
-                        else startActivity(pod);
-                    break;*/
+                case R.id.SocialBtn:
+                    Intent social = getPackageManager().getLaunchIntentForPackage(Constants.Fedilab);
+                    if(getPackageManager().getLaunchIntentForPackage(Fedilab) == null) {
+                        showSocialDialog();
+                        break;
+                    }
+                    else startActivity(social);
+                    break;
                case R.id.ForumBtn:
                    webView.loadUrl(Constants.URL_DisApp_FORUM);
                    hideDashboard();
@ -386,7 +387,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
                case R.id.PadBtn:
                    Intent pad = getPackageManager().getLaunchIntentForPackage(Constants.Padland);
                    if(pad == null) {
-                        showPAdDialog();
+                        showPadDialog();
                        break;
                    }
                    else startActivity(pad);
@ -407,10 +408,10 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
                    webView.loadUrl(Constants.URL_DisApp_SEARX);
                    hideDashboard();
                    break;
-                case R.id.BoardBtn:
+                /*case R.id.BoardBtn:
                    webView.loadUrl(Constants.URL_DisApp_BOARD);
                    hideDashboard();
-                    break;
+                    break;*/
                case R.id.CallsBtn:
                    Intent board = getPackageManager().getLaunchIntentForPackage(Constants.CallsApp);
                    if(board == null) {
@ -466,9 +467,9 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
            case R.id.CloudBtn:
                showCloudInfo();
                break;
-            /*case R.id.DiasporaBtn://end of Disroot's Dandelion
-                showDiaInfo();
-                break;*/
+            case R.id.SocialBtn:
+                showSocialInfo();
+                break;
            case R.id.ForumBtn:
                showForumInfo();
                break;
@ -490,9 +491,9 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
            case R.id.SearxBtn:
                showSearxInfo();
                break;
-            case R.id.BoardBtn:
+            /*case R.id.BoardBtn:
                showBoardInfo();
-                break;
+                break;*/
            case R.id.CallsBtn:
                showCallsInfo();
                break;
@ -701,39 +702,38 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
        builder.show();
    }

-    /*End of Disroot's Dandelion*
-    //Diaspora info
-    private void showDiaInfo() {
+    //Akkoma info
+    private void showSocialInfo() {
        AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this);
        builder.setCancelable(false);
-        builder.setTitle(R.string.DiasporaTitle);
-        builder.setMessage(getString(R.string.DiasporaInfo));
+        builder.setTitle(R.string.AkkomaTitle);
+        builder.setMessage(getString(R.string.AkkomaInfo));
        builder.setPositiveButton(R.string.global_ok, null);
        builder.setNegativeButton(R.string.tell_more, new DialogInterface.OnClickListener() {
            @Override
            public void onClick(DialogInterface dialog, int which) {
-                webView.loadUrl(Constants.URL_DisApp_DIAHELP);
+                webView.loadUrl(Constants.URL_DisApp_SOCIALHELP);
                hideDashboard();
            }
        });
        builder.show();
    }
-    private void showDiaDialog(){
+    private void showSocialDialog(){
        AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this);
        builder.setCancelable(false);
        builder.setTitle(R.string.DiaInstallTitle);
-        builder.setMessage(getString(R.string.DiasporaDialog));
+        builder.setMessage(getString(R.string.AkkomaDialog));
        builder.setPositiveButton(R.string.global_install, new DialogInterface.OnClickListener() {
-            Intent pod = getPackageManager().getLaunchIntentForPackage(Diaspora);
+            Intent social = getPackageManager().getLaunchIntentForPackage(Constants.Fedilab);
            @Override
            public void onClick(DialogInterface dialog, int which) {
-                pod = new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=" + Diaspora));
-                startActivity(pod);
+                social = new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=" + Constants.Fedilab));
+                startActivity(social);
            }
        });
        builder.setNegativeButton(R.string.global_cancel , null);
        builder.show();
-    }*/
+    }

    private void showForumInfo() {
        AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this);
@ -860,7 +860,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
        });
        builder.show();
    }
-    private void showPAdDialog(){
+    private void showPadDialog(){
        AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this);
        builder.setCancelable(false);
        builder.setTitle(R.string.DiaInstallTitle);
@ -982,7 +982,8 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
        builder.show();
    }

-    private void showBoardInfo() {
+    // Taiga not used; unavailable until another 'board' is decided upon
+    /*private void showBoardInfo() {
        AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this);
        builder.setCancelable(false);
        builder.setTitle(R.string.BoardTitle);
@ -1007,6 +1008,23 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
        });
        builder.show();
    }
+    
+    private void showBoardDialog(){
+        AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this);
+        builder.setCancelable(false);
+        builder.setTitle(R.string.DiaInstallTitle);
+        builder.setMessage(taiga +"\n\n"+ getString(R.string.CallsDialog));
+        builder.setPositiveButton(R.string.global_install, new DialogInterface.OnClickListener() {
+            Intent calls = getPackageManager().getLaunchIntentForPackage(Constants.CallsApp);
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                calls = new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=" + Constants.CallsApp));
+                startActivity(calls);
+            }
+        });
+        builder.setNegativeButton(R.string.global_cancel , null);
+        builder.show();
+    }*/

    private void showCallsInfo() {
        AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this);
@ -1033,24 +1051,8 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
        });
        builder.show();
    }
-    private void showBoardDialog(){
-        AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this);
-        builder.setCancelable(false);
-        builder.setTitle(R.string.DiaInstallTitle);
-        builder.setMessage(taiga +"\n\n"+ getString(R.string.CallsDialog));
-        builder.setPositiveButton(R.string.global_install, new DialogInterface.OnClickListener() {
-            Intent calls = getPackageManager().getLaunchIntentForPackage(Constants.CallsApp);
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                calls = new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=" + Constants.CallsApp));
-                startActivity(calls);
-            }
-        });
-        builder.setNegativeButton(R.string.global_cancel , null);
-        builder.show();
-    }

-    //There is no extra info about Nextcoud notes yet
+    //There is no extra info about Nextcloud notes yet
    private void showNotesInfo() {
        AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this);
        builder.setCancelable(false);
@ -1181,8 +1183,8 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
            }

        });
-        //SocialBtn
-        Button SocialBtn = view.findViewById(R.id.SocialBtn);
+        //SocialBtn - Possibly needs a rename, when it is reimplemented
+        /*Button SocialBtn = view.findViewById(R.id.SocialBtn);
        SocialBtn.setOnClickListener(new View.OnClickListener() {
            public void onClick(View arg0) {
                Uri uri = Uri.parse(String.valueOf(Constants.URL_DisApp_STATESOCIAL));
@ -1190,7 +1192,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
                startActivity(social);
            }

-        });
+        });*/
        //newsBtn
        Button NewsBtn = view.findViewById(R.id.NewsBtn);
        NewsBtn.setOnClickListener(new View.OnClickListener() {
@ -2007,10 +2009,14 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
                        searx = description;
                        getSearx(searx);
                        break;
-                    case "Project board":
+                    case "Fedisroot":
+                        akkoma = description;
+                        getAkkoma(akkoma);
+                        break;
+                    /*case "Project board":
                        taiga = description;
                        getTaiga(taiga);
-                        break;
+                        break;*/
                    case "User Password management":
                        user = description;
                        getUser(user);
@ -2053,9 +2059,12 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
    private void getSearx(String string){
        searx = string;
    }
-    private void getTaiga(String string){
-        taiga = string;
+    private void getAkkoma(String string){
+        akkoma = string;
    }
+    /*private void getTaiga(String string){
+        taiga = string;
+    }*/
    private void getUser(String string){
        user = string;
    }
--- a/app/src/main/java/org/disroot/disrootapp/ui/SettingsActivity.java
+++ b/app/src/main/java/org/disroot/disrootapp/ui/SettingsActivity.java
@ -55,7 +55,8 @@ public class SettingsActivity extends AppCompatActivity {
        BtnPreference = getSharedPreferences( "BinBtn", Context.MODE_PRIVATE );//bin
        BtnPreference = getSharedPreferences( "UploadBtn", Context.MODE_PRIVATE );//upload
        BtnPreference = getSharedPreferences( "SearxBtn", Context.MODE_PRIVATE );//searx
-        BtnPreference = getSharedPreferences( "BoardBtn", Context.MODE_PRIVATE );//Board
+        BtnPreference = getSharedPreferences( "SocialBtn", Context.MODE_PRIVATE );//social
+        /*BtnPreference = getSharedPreferences( "BoardBtn", Context.MODE_PRIVATE );//Board*/
        BtnPreference = getSharedPreferences( "CallsBtn", Context.MODE_PRIVATE );//calls
        BtnPreference = getSharedPreferences( "NotesBtn", Context.MODE_PRIVATE );//notes
        BtnPreference = getSharedPreferences( "GitBtn", Context.MODE_PRIVATE );//git
@ -80,7 +81,8 @@ public class SettingsActivity extends AppCompatActivity {
        final CheckBox checkBinBtn = iconSettings.findViewById( R.id.binBtnPreference );//bin
        final CheckBox checkUploadBtn = iconSettings.findViewById( R.id.uploadBtnPreference );//upload
        final CheckBox checkSearxBtn = iconSettings.findViewById( R.id.searxBtnPreference );//search
-        final CheckBox checkBoardBtn = iconSettings.findViewById( R.id.boardBtnPreference );//board
+        final CheckBox checkSocialBtn = iconSettings.findViewById( R.id.socialBtnPreference );//social
+        /*final CheckBox checkBoardBtn = iconSettings.findViewById( R.id.boardBtnPreference );//board*/
        final CheckBox checkCallsBtn = iconSettings.findViewById( R.id.callsBtnPreference );//calls
        final CheckBox checkNotesBtn = iconSettings.findViewById( R.id.notesBtnPreference );//notes
        final CheckBox checkGitBtn = iconSettings.findViewById( R.id.gitBtnPreference );//git
@ -98,7 +100,8 @@ public class SettingsActivity extends AppCompatActivity {
        if (BtnPreference.getBoolean( "BinBtn", true )) checkBinBtn.setChecked( true );//bin
        if (BtnPreference.getBoolean( "UploadBtn", true )) checkUploadBtn.setChecked( true );//upload
        if (BtnPreference.getBoolean( "SearxBtn", true )) checkSearxBtn.setChecked( true );//search
-        if (BtnPreference.getBoolean( "BoardBtn", true )) checkBoardBtn.setChecked( true );//board
+        if (BtnPreference.getBoolean( "SocialBtn", true )) checkSocialBtn.setChecked( true );//social
+        /*if (BtnPreference.getBoolean( "BoardBtn", true )) checkBoardBtn.setChecked( true );//board*/
        if (BtnPreference.getBoolean( "CallsBtn", true )) checkCallsBtn.setChecked( true );//calls
        if (BtnPreference.getBoolean( "NotesBtn", true )) checkNotesBtn.setChecked( true );//notes
        if (BtnPreference.getBoolean( "GitBtn", true )) checkGitBtn.setChecked( true );//git
@ -187,16 +190,25 @@ public class SettingsActivity extends AppCompatActivity {
            }
        } );

-        //board
-        checkBoardBtn.setOnCheckedChangeListener( (view, isChecked) -> {
+        //social
+        checkSocialBtn.setOnCheckedChangeListener( (view, isChecked) -> {
+            if (checkSocialBtn.isChecked()) {
+                BtnPreference.edit().putBoolean( "SocialBtn", true ).apply();
+            } else {
+                BtnPreference.edit().putBoolean( "SocialBtn", false ).apply();
+            }
+        } );
+
+        //board - not used at the moment
+        /*checkBoardBtn.setOnCheckedChangeListener( (view, isChecked) -> {
            if (checkBoardBtn.isChecked()) {
                BtnPreference.edit().putBoolean( "BoardBtn", true ).apply();
            } else {
                BtnPreference.edit().putBoolean( "BoardBtn", false ).apply();
            }
-        } );
+        } );*/

-        //board
+        //calls
        checkCallsBtn.setOnCheckedChangeListener( (view, isChecked) -> {
            if (checkCallsBtn.isChecked()) {
                BtnPreference.edit().putBoolean( "CallsBtn", true ).apply();
--- a/app/src/main/java/org/disroot/disrootapp/utils/Constants.java
+++ b/app/src/main/java/org/disroot/disrootapp/utils/Constants.java
@ -23,7 +23,7 @@ public class Constants {
    public static final String URL_DisApp_SEARXHELP = "https://disroot.org/services/search";
    public static final String URL_DisApp_STATEXMPP = "xmpp:state@chat.disroot.org?join";
    public static final String URL_DisApp_STATEMATRIX = "https://matrix.to/#/#state:disroot.org";
-    public static final String URL_DisApp_STATESOCIAL = "https://hub.disroot.org/channel/disroot_state";
+    /*public static final String URL_DisApp_STATESOCIAL = "https://hub.disroot.org/channel/disroot_state";*/
    public static final String URL_DisApp_STATENEWS = "https://state.disroot.org/subscribe";
    public static final String URL_DisApp_STATERSS = "https://state.disroot.org/atom";

@ -43,7 +43,8 @@ public class Constants {
    public static final String URL_DisApp_CRYPTPADHELP = "https://howto.disroot.org/en/tutorials/office/cryptpad";
    public static final String URL_DisApp_BINHELP = "https://howto.disroot.org/en/tutorials/office/bin";
    public static final String URL_DisApp_UPLOADHELP = "https://howto.disroot.org/en/tutorials/office/lufi";
-    public static final String URL_DisApp_BOARDHELP = "https://howto.disroot.org/en/tutorials/project_board";
+    /*public static final String URL_DisApp_BOARDHELP = "https://howto.disroot.org/en/tutorials/project_board";*/
+    public static final String URL_DisApp_SOCIALHELP = "https://howto.disroot.org/en/tutorials/social/fedisroot";
    public static final String URL_DisApp_NOTESHELP = "https://howto.disroot.org/en/tutorials/cloud/apps/notes";
    public static final String URL_DisApp_CALLSHELP = "https://disroot.org/en/services/calls";
    public static final String URL_DisApp_GITHELP = "https://howto.disroot.org/en/contribute/git";
@ -51,7 +52,7 @@ public class Constants {

    public static final String k9 = "com.fsck.k9";
    public static final String nc = "com.nextcloud.client";
-    public static final String Diaspora = "com.github.dfa.diaspora_android";
+    public static final String Fedilab = "fr.gouv.etalab.mastodon";
    public static final String Conversations = "eu.siacs.conversations";
    public static final String PixArt = "de.pixart.messenger";
    public static final String Padland = "com.mikifus.padland";
--- a/app/src/main/java/org/disroot/disrootapp/utils/Contributors.java
+++ b/app/src/main/java/org/disroot/disrootapp/utils/Contributors.java
@ -5,11 +5,11 @@ package org.disroot.disrootapp.utils;
 */
 public class Contributors {
    public static final String[] admins= {
-            "<a href='https://hub.disroot.org/channel/muppeth'>Muppeth",
-            "<a href='https://hub.disroot.org/channel/antilopa'>Antilopa"
+            "<a href='https://fe.disroot.org/@muppeth'>Muppeth",
+            "<a href='https://fe.disroot.org/@antilopa'>Antilopa"
    };
    public static final String[] devs= {
-            "<a href='https://hub.disroot.org/channel/massimiliano'>Massimiliano"
+            "<a href='https://fe.disroot.org/@massimiliano'>Massimiliano"
    };
    public static final String[] translators= {
            "Fede",
@ -20,6 +20,6 @@ public class Contributors {
            "shadowsword"
    };
    public static final String[] artworks= {
-            "<a href='https://hub.disroot.org/channel/antilopa'>Antilopa"
+            "<a href='https://fe.disroot.org/@antilopa'>Antilopa"
    };
 }
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@ -95,16 +95,16 @@
                    android:textColor="@color/white"
                    app:fontFamily="@font/open_sans_regular" />

-                <!--end of Disroot's Dandelion
+                <!-- ic_diaspora used, until ic_akkoma created -->
                <Button
-                    android:id="@+id/DiasporaBtn"
+                    android:id="@+id/SocialBtn"
                    style="?android:attr/borderlessButtonStyle"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:drawableTop="@drawable/ic_diaspora"
-                    android:text="@string/action_diaspora"
+                    android:text="@string/action_akkoma"
                    android:textColor="#ffffff"
-                    app:fontFamily="@font/open_sans_regular" />-->
+                    app:fontFamily="@font/open_sans_regular" />

                <Button
                    android:id="@+id/ForumBtn"
@ -176,6 +176,7 @@
                    android:textColor="@color/white"
                    app:fontFamily="@font/open_sans_regular" />

+                <!-- Taiga not used; unavailable until another 'board' is decided upon
                <Button
                    android:id="@+id/BoardBtn"
                    style="?android:attr/borderlessButtonStyle"
@ -186,6 +187,7 @@
                    android:text="@string/action_board"
                    android:textColor="@color/white"
                    app:fontFamily="@font/open_sans_regular" />
+                    -->

                <Button
                    android:id="@+id/CallsBtn"
--- a/app/src/main/res/layout/state_dialog.xml
+++ b/app/src/main/res/layout/state_dialog.xml
@ -27,12 +27,12 @@
            android:layout_height="wrap_content"
            style="?android:attr/borderlessButtonStyle"
            android:text="@string/matrixBtn"/>
-        <Button
+        <!--<Button
            android:id="@+id/SocialBtn"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            style="?android:attr/borderlessButtonStyle"
-            android:text="@string/SocialBtn"/>
+            android:text="@string/SocialBtn"/>-->
        <Button
            android:id="@+id/NewsBtn"
            android:layout_width="wrap_content"
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@ -3,7 +3,7 @@
    <string name="action_home">Home</string>
    <string name="action_mail">Mail</string>
    <string name="action_cloud">Cloud</string>
-    <string name="action_diaspora">Diaspora*</string>
+    <string name="action_akkoma">Akkoma</string>
    <string name="action_forum">Forum</string>
    <string name="action_chat">Chat</string>
    <string name="action_pad">Etherpad</string>
@ -62,8 +62,8 @@
    <string name="DisrootWeb">Disroot web</string> //website?
    <string name="FirstTitle">Ein paar letzte Hinweise!</string>
    <string name="FirstInfo">&#8226; Wenn du lange auf ein Icon drückst, erhältst du weitere Informationen… \n\n&#8226; Die Disroot-App kann sich mit der Statusseite von Disroot synchronisieren. Das heißt, dass Du in Echtzeit Neuigkeiten zu Problemen, Downtimes, geplanten Wartungen und Anderem erhältst, die auf https://state.disroot.org veröffentlicht werden.\nWir empfehlen, die Batterieoptimierung abzuschalten und der Disroot-App zu erlauben, im Hintergrund zu laufen. Wenn Du nicht sicher bist, kannst Du die Einstellungen später jederzeit im Menü der Disroot-App ändern.</string>
-    <string name="DiasporaTitle">Diaspora* Einstellungen</string>
-    <string name="DiasporaInfo">Soziales Netzwerk basierend auf einem dezentralem und verteiltem System. Poste, teile, like, gründe Communities.\n\nUsername:\n dein_diaspora_username@pod.disroot.org\n\nPasswort:\n dein_diaspora_passwort</string>
+    <string name="AkkomaTitle">Akkoma Einstellungen</string>
+    <string name="AkkomaInfo">Soziales Netzwerk basierend auf einem dezentralem und verteiltem System. Poste, teile, like, gründe Communities.\n\nUsername:\n dein_disroot_username@fe.disroot.org\n\nPasswort:\n dein_disroot_passwort</string>
    <string name="PadInfo">Mit Etherpad kannst du  mit anderen zusammen in Echtzeit an einem Text-Dokument arbeiten. zB Artikel, Presse release, to-do liste, usw. mit mehreren Teilnehmern, zur gleichen Zeit, dasselbe Dokument bearbeiten.\nKeine Registrierung notwendig.</string>
    <string name="PadTitle">EtherPad Info</string>
    <string name="ChatTitle">XMPP Einstellungen\n</string>
@ -95,7 +95,7 @@
    <string name="logo">Logo</string>
    <string name="xmppBtn"> \ \ &#8226; Status über xmpp</string>
    <string name="matrixBtn"> \ \ &#8226; Status über Matrix</string>
-    <string name="SocialBtn"> \ \ &#8226; Status über Hubzilla/diaspora/mastodon</string>
+    <!--<string name="SocialBtn"> \ \ &#8226; Status über Fe.disroot</string>-->
    <string name="NewsBtn"> \ \ &#8226; Status updates via email</string>
    <string name="RssBtn"> \ \ &#8226; Status RSS feed</string>
    <string name="ChooseChatTitle">Sie haben zwei XMPP Clients installiert!</string>
@ -108,7 +108,7 @@
    <string name="title_activity_tap">TapActivity</string> <!-- ?? -->
    <string name="action_clear_cookies">Lösche Cookies</string>
    <string name="DiaInstallTitle">Installationsanfrage</string>
-    <string name="DiasporaDialog">Um fortzufahren, müssen Sie zunächst Dandelion installieren.\nBitte wählen Sie installieren, um mit der Installation in F-Droid fortzufahren.</string>
+    <string name="AkkomaDialog">Um fortzufahren, müssen Sie zunächst Fedilab installieren.\nBitte wählen Sie installieren, um mit der Installation in F-Droid fortzufahren.</string>
    <string name="global_cancel">Abbrechen</string>
    <string name="global_install">Installieren</string>
    <string name="MailDialog">Um fortzufahren, müssen Sie zunächst K9-Mail installieren.\nBitte wählen Sie installieren, um mit der Installation in F-Droid fortzufahren.</string>
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@ -3,7 +3,7 @@
    <string name="action_home">Inicio</string>
    <string name="action_mail">Correo</string>
    <string name="action_cloud">Nube</string>
-    <string name="action_diaspora">Diaspora*</string>
+    <string name="action_akkoma">Akkoma</string>
    <string name="action_forum">Foro</string>
    <string name="action_chat">Chat</string>
    <string name="action_pad">Etherpad</string>
@ -74,8 +74,8 @@
    <string name="DisrootWeb">Sitio de Disroot</string>
    <string name="FirstTitle">Un par de cosas más… </string>
    <string name="FirstInfo">&#8226; Haciendo una presión larga sobre cada ícono, puedes obtener información adicional… \n\n&#8226; La aplicación puede sincronizar con la página de estado de Disroot. Esto significa que recibirás actualizaciones en tiempo real sobre inconvenientes, caídas, mantenimientos programados y otros que fueran publicados a través de https://state.disroot.org\nRecomendamos apagar la optimización de batería y permitir a la aplicación de Disroot correr en segundo plano. Si no estás seguro, siempre puedes volver a cambiar la configuración desde el menu de la aplicación de Disroot.</string>
-    <string name="DiasporaTitle">Configuración de Diaspora*</string>
-    <string name="DiasporaInfo">Red social distribuida y descentralizada. Publica, comparte, crea comunidades.\nUsuarix: tu_usuarix_de_Diaspora@pod.disroot.org\nContraseña: tu_contraseña_de_diaspora</string>
+    <string name="AkkomaTitle">Configuración de Akkoma</string>
+    <string name="AkkomaInfo">Red social distribuida y descentralizada. Publica, comparte, crea comunidades.\nUsuarix: tu_usuarix_de_Diaspora@fe.disroot.org\nContraseña: tu_contraseña_de_diaspora</string>
    <string name="PadInfo">EtherPad</string>
    <string name="PadTitle">Etherpad:\nEscribe artículos, anuncios de prensa, listas de pendientes, etc., junto a amigxs, compañerxs de estudios o colegas, todxs trabajando en el mismo documento al mismo tiempo.</string>
    <string name="ChatTitle">Configuración de XMPP\n</string>
@ -107,7 +107,7 @@
    <string name="logo">Logo</string>
    <string name="xmppBtn"> \ \ &#8226; Estado de xmpp</string>
    <string name="matrixBtn"> \ \ &#8226; Estado de Matrix</string>
-    <string name="SocialBtn"> \ \ &#8226; Estado de Hubzilla/Diaspora*/Mastodon</string>
+    <!--<string name="SocialBtn"> \ \ &#8226; Estado de Fe.disroot</string>-->
    <string name="NewsBtn"> \ \ &#8226; Actualización de estados por email</string>
    <string name="RssBtn">Recomendamos apagar la optimización de batería y permitir a la aplicación de Disroot correr en segundo plano. Si no estás seguro, siempre puedes volver a cambiar la configuración desde el menu de la aplicación de Disroot.</string>
    <string name="ChooseChatTitle">¡Tienes dos clientes XMPP instalados!</string>
@ -120,7 +120,7 @@
    <string name="title_activity_tap">TapActivity</string>
    <string name="action_clear_cookies">Limpiar cookies</string>
    <string name="DiaInstallTitle">Solicitud de instalación</string>
-    <string name="DiasporaDialog">Para continuar, primero necesitas instalar Dandelion.\nPor favor, selecciona Instalar para continuar desde F-Droid.</string>
+    <string name="AkkomaDialog">Para continuar, primero necesitas instalar Fedilab.\nPor favor, selecciona Instalar para continuar desde F-Droid.</string>
    <string name="global_cancel">Cancelar</string>
    <string name="global_install">Instalar</string>
    <string name="MailDialog">Para continuar, primero necesitas instalar K9-Mail.\nPor favor, selecciona Instalar para continuar desde F-Droid.</string>
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@ -4,7 +4,7 @@
    <string name="action_home">Accueil</string>
    <string name="action_mail">Courrier</string>
    <string name="action_cloud">Cloud</string>
-    <string name="action_diaspora">Diaspora*</string>
+    <string name="action_akkoma">Akkoma</string>
    <string name="action_forum">Forum</string>
    <string name="action_chat">Chat</string>
    <string name="action_pad">Etherpad</string>
@ -99,11 +99,11 @@
    <string name="DisrootWeb">Disroot web</string>
    <string name="FirstTitle">Dernière chose !</string>
    <string name="FirstInfo"><![CDATA[• En appuyant longuement sur chaque icône, vous pouvez obtenir des informations supplémentaires… \n\n&#8226 ; L\'application peut se synchroniser avec la page de statut de Disroot. Cela signifie que vous recevrez des mises à jour en temps réel sur les problèmes, les temps d\'arrêt, la maintenance programmée et d\'autres problèmes publiés via https://state.disroot.org\nNous vous recommandons de désactiver l\'optimisation de la batterie et d\'autoriser l\'application Disroot à fonctionner en arrière-plan. Si vous n\'êtes pas sûr, vous pouvez toujours changer le réglage à partir du menu de l\'application Disroot plus tard.]]></string>
-    <string name="DiasporaTitle">Paramètres Diaspora*</string>
-    <string name="DiasporaInfo">Réseau social distribué et décentralisé. Postez, partagez, aimez, créez des communautés.
+    <string name="AkkomaTitle">Paramètres Akkoma</string>
+    <string name="AkkomaInfo">Réseau social distribué et décentralisé. Postez, partagez, aimez, créez des communautés.
 \n
 \nNom d\'utilisateur :
-\n votre_nom_d\'utilisateur_diaspora@pod.disroot.org
+\n votre_nom_d\'utilisateur_diaspora@fe.disroot.org
 \n
 \nMot de passe :
 \n votre_mot_de_passe_diaspora</string>
@ -139,7 +139,7 @@
    <string name="logo">Logo</string>
    <string name="xmppBtn">"\\  • État des services sur xmpp"</string>
    <string name="matrixBtn">"\\  • État des services sur Matrix"</string>
-    <string name="SocialBtn">"\\  • État des services sur hubzilla/diaspora/mastodon"</string>
+    <!--<string name="SocialBtn">"\\  • État des services sur Fe.disroot"</string>-->
    <string name="NewsBtn">"\\  • Info sur l\'état des services par courriel"</string>
    <string name="RssBtn">"\\  • État des services par flux RSS"</string>
    <string name="ChooseChatTitle">Vous avez deux clients XMPP installés !</string>
@ -152,7 +152,7 @@
    <string name="title_activity_tap">TapActivity</string>
    <string name="action_clear_cookies">Effacer les cookies</string>
    <string name="DiaInstallTitle">Demande d\'installation</string>
-    <string name="DiasporaDialog">Pour continuer, vous devez d\'abord installer Dandelion.\nVeuillez sélectionner Installer pour continuer l\'installation avec F-Droid.</string>
+    <string name="AkkomaDialog">Pour continuer, vous devez d\'abord installer Fedilab.\nVeuillez sélectionner Installer pour continuer l\'installation avec F-Droid.</string>
    <string name="global_cancel">Annuler</string>
    <string name="global_install">Installer</string>
    <string name="MailDialog">Pour continuer, vous devez d\'abord installer K9-Mail.\nVeuillez sélectionner Installer pour continuer l\'installation avec F-Droid.</string>
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@ -3,7 +3,7 @@
    <string name="action_home">Home</string>
    <string name="action_mail">E-Mail</string>
    <string name="action_cloud">Cloud</string>
-    <string name="action_diaspora">Diaspora*</string>
+    <string name="action_akkoma">Akkoma</string>
    <string name="action_forum">Forum</string>
    <string name="action_chat">Chat</string>
    <string name="action_pad">Etherpad</string>
@ -62,8 +62,8 @@
    <string name="DisrootWeb">Disroot web</string>
    <string name="FirstTitle">Le Ultime cose!</string>
    <string name="FirstInfo">&#8226; È possibile premere a lungo su ogni icona per visualizzare informazioni aggiuntive… \n\n&#8226; L\'applicazione può sincronizzarsi con la pagina di stato di Disroot. Questo significa che riceverai in tempo reale aggiornamenti su problemi, tempi di inattività, manutenzione programmata e altri aggiornamenti pubblicati su https://state.disroot.org\nSi consiglia di disattivare l\'ottimizzazione della batteria e consentire all\'applicazione Disroot di funzionare in background. Se non si è sicuri, è sempre possibile modificare le impostazioni dal menu dell\'applicazione Disroot in un secondo momento.</string>
-    <string name="DiasporaTitle">Impostazioni Diaspora*</string>
-    <string name="DiasporaInfo">Rete sociale distribuita e decentralizzata. Pubblicare, condividere, tipo, creare comunità.\n\nNome utente:\n il_tuo_nome_utente_diaspora_@pod.disroot.org\n\nPassword:\n la_tua_password_diaspora</string>
+    <string name="AkkomaTitle">Impostazioni Akkoma</string>
+    <string name="AkkomaInfo">Rete sociale distribuita e decentralizzata. Pubblicare, condividere, tipo, creare comunità.\n\nNome utente:\n il_tuo_nome_utente_disroot_@fe.disroot.org\n\nPassword:\n la_tua_password_diaspora</string>
    <string name="PadInfo">Con Etherpad scrivere articoli, comunicati stampa, liste di cose da fare, ecc. insieme ad amici, compagni di studio o colleghi, tutti che lavorano sullo stesso documento allo stesso tempo.\nNon è richiesta alcuna registrazione.</string>
    <string name="PadTitle">Info EtherPad</string>
    <string name="ChatTitle">Impostazioni XMPP\n</string>
@ -95,7 +95,7 @@
    <string name="logo">Logo</string>
    <string name="xmppBtn"> \ \ &#8226; Stato su xmpp</string>
    <string name="matrixBtn"> \ \ &#8226; Stato su Matrix</string>
-    <string name="SocialBtn"> \ \ &#8226; Stato su hubzilla/diaspora/mastodon</string>
+    <!--<string name="SocialBtn"> \ \ &#8226; Stato su Fe.disroot</string>-->
    <string name="NewsBtn"> \ \ &#8226; Aggiornamenti di stato via e-mail</string>
    <string name="RssBtn"> \ \ &#8226; Stato su RSS feed</string>
    <string name="ChooseChatTitle">Sono installati due client XMPP!</string>
@ -108,7 +108,7 @@
    <string name="title_activity_tap">TapActivity</string>
    <string name="action_clear_cookies">Elimina i cookie</string>
    <string name="DiaInstallTitle">Richiesta installazione</string>
-    <string name="DiasporaDialog">Per continuare è necessario installare Dandelion.\nSelezionate installa per continuare con l\'installazione su F-Droid.</string>
+    <string name="AkkomaDialog">Per continuare è necessario installare Fedilab.\nSelezionate installa per continuare con l\'installazione su F-Droid.</string>
    <string name="global_cancel">Annulla</string>
    <string name="global_install">Installa</string>
    <string name="MailDialog">Per continuare è necessario installare K9-Mail.\nSelezionate installa per continuare con l\'installazione su F-Droid.</string>
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@ -3,7 +3,7 @@
    <string name="action_home">Home</string>
    <string name="action_mail">Mail</string>
    <string name="action_cloud">Cloud</string>
-    <string name="action_diaspora">Diaspora*</string>
+    <string name="action_akkoma">Akkoma</string>
    <string name="action_forum">Forum</string>
    <string name="action_chat">Chat</string>
    <string name="action_pad">Etherpad</string>
@ -74,8 +74,8 @@
    <string name="DisrootWeb">Disroot web</string>
    <string name="FirstTitle">De laatste paar dingen!</string>
    <string name="FirstInfo">&#8226; Je kan op elk pictogram lang drukken om jou extra informatie te tonen…&#8226; De app kan synchroniseren met de statuspagina van Disroot. Dit betekent dat u realtime updates ontvangt over issues, downtimes, gepland onderhoud en andere zaken die gepubliceerd worden via https://state.disroot.org\nWe raden aan om de batterijoptimalisatie uit te schakelen en de Disroot app op de achtergrond te laten draaien. Als u niet zeker bent, kunt u de instelling later altijd nog wijzigen vanuit het Disroot app menu.</string>
-    <string name="DiasporaTitle">Diaspora* Instellingen</string>
-    <string name="DiasporaInfo">Gedistribueerd en gedecentraliseerd sociaal netwerk. Plaatsen, delen, liken, gemeenschappen creëren.\n\nGebruikersnaam:\n jou_diaspora_gebruikersnaam@pod.disroot.org\n\nWachtwoord:\n jou_diaspora_wachtwoord</string>
+    <string name="AkkomaTitle">Diaspora* Instellingen</string>
+    <string name="AkkomaInfo">Gedistribueerd en gedecentraliseerd sociaal netwerk. Plaatsen, delen, liken, gemeenschappen creëren.\n\nGebruikersnaam:\n jou_disroot_gebruikersnaam@fe.disroot.org\n\nWachtwoord:\n jou_disroot_wachtwoord</string>
    <string name="PadInfo">Met Etherpad schrijf artikelen, persberichten, to-do lijsten, etc. samen met vrienden, medestudenten of collega\'s, die allemaal op hetzelfde moment aan hetzelfde document werken.\nEr is geen registratie vereist.</string>
    <string name="PadTitle">EtherPad Info</string>
    <string name="ChatTitle">XMPP Instellingen\n</string>
@ -108,7 +108,7 @@
    <string name="logo">Logo</string>
    <string name="xmppBtn"> \ \ &#8226; Status op xmpp</string>
    <string name="matrixBtn"> \ \ &#8226; Status op Matrix</string>
-    <string name="SocialBtn"> \ \ &#8226; Status op hubzilla/diaspora/mastodon</string>
+    <!--<string name="SocialBtn"> \ \ &#8226; Status op Fe.disroot</string>-->
    <string name="NewsBtn"> \ \ &#8226; Status updates via email</string>
    <string name="RssBtn"> \ \ &#8226; Status RSS feed</string>
    <string name="ChooseChatTitle">Je hebt twee XMPP-clients geïnstalleerd!</string>
@ -121,7 +121,7 @@
    <string name="title_activity_tap">TapActivity</string>
    <string name="action_clear_cookies">Verwijder cookies</string>
    <string name="DiaInstallTitle">Installatie vereist</string>
-    <string name="DiasporaDialog">Om verder te gaan moet u eerst Dandelion installeren.\nPlease select install to continue with the installatin on F-Droid.</string>
+    <string name="AkkomaDialog">Om verder te gaan moet u eerst Fedilab installeren.\nPlease select install to continue with the installatin on F-Droid.</string>
    <string name="global_cancel">Annuleren</string>
    <string name="global_install">Installeren</string>
    <string name="MailDialog">Om verder te gaan moet u eerst K9-Mail installeren.\nSelecteer Installeren om verder te gaan met de installatie op F-Droid.</string>
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@ -3,7 +3,7 @@
    <string name="action_home">Início</string>
    <string name="action_mail">E-mail</string>
    <string name="action_cloud">Nuvem</string>
-    <string name="action_diaspora">Diaspora*</string>
+    <string name="action_akkoma">Akkoma</string>
    <string name="action_forum">Fórum</string>
    <string name="action_chat">Chat</string>
    <string name="action_pad">Pad</string>
@ -67,8 +67,8 @@
    <string name="DisrootWeb">Disroot web</string>
    <string name="FirstTitle">Quase esqueci!</string>
    <string name="FirstInfo">&#8226; Ao pressionar e segurar cada ícone, você pode obter mais informações… \n\n&#8226; O App pode sincronizar com a página de status do Disroot. Isto significa que você receberá atualizações sobre problemas, tempo de inatividade, manutenção programada e outras coisas em tempo real via infos publicadas no https://state.disroot.org\nn Recomendamos que desligue a otimização da bateria e permite o Disroot app ser ativo em segundo plano. Se você não tiver certeza, sempre pode mudar a configuração no menu do Disroot a qualquer momento.</string>
-    <string name="DiasporaTitle">Configurações do Diaspora*</string>
-    <string name="DiasporaInfo">Rede social distribuída e descentralizada. Publicar, compartilhar, curtir, criar comunidades.\n\nNome de usuário:\n seu_nome_de_usuário_do_diaspora@pod.disroot.org\n\nSenha:\n sua_senha_do_diaspora</string>
+    <string name="AkkomaTitle">Configurações do Akkoma</string>
+    <string name="AkkomaInfo">Rede social distribuída e descentralizada. Publicar, compartilhar, curtir, criar comunidades.\n\nNome de usuário:\n seu_nome_de_usuário_do_diaspora@fe.disroot.org\n\nSenha:\n sua_senha_do_diaspora</string>
    <string name="PadInfo">Com o Etherpad pode escrever artigos, comunicados de imprensa, criar listas de tarefas, etc. junto com outras pessoas, amigos, colegas, todos trabalhando no mesmo documento ao mesmo tempo.\nNão é necessário ter uma conta para usar.</string>
    <string name="PadTitle">Sobre EtherPad</string>
    <string name="ChatTitle">Configurações de XMPP\n</string>
@ -100,7 +100,7 @@
    <string name="logo">Logo</string>
    <string name="xmppBtn"> \ \ &#8226; Status no xmpp</string>
    <string name="matrixBtn"> \ \ &#8226; Status no Matrix</string>
-    <string name="SocialBtn"> \ \ &#8226; Status no Hubzilla/diaspora/mastodon</string>
+    <!--<string name="SocialBtn"> \ \ &#8226; Status no Fe.disroot</string>-->
    <string name="NewsBtn"> \ \ &#8226; Status de atualizações via e-mail</string>
    <string name="RssBtn"> \ \ &#8226; Status no RSS feed</string>
    <string name="ChooseChatTitle">Você tem dois clientes XMPP instalados!</string>
@ -113,7 +113,7 @@
    <string name="title_activity_tap">TapActivity</string>
    <string name="action_clear_cookies">Excluir os cookies</string>
    <string name="DiaInstallTitle">Pedido de instalação</string>
-    <string name="DiasporaDialog">Para continuar, você precisa instalar Dandelion primeiro.\nPor favor, selecione instalar para continuar com a instalação no F-Droid.</string>
+    <string name="AkkomaDialog">Para continuar, você precisa instalar Fedilab primeiro.\nPor favor, selecione instalar para continuar com a instalação no F-Droid.</string>
    <string name="global_cancel">Cancelar</string>
    <string name="global_install">Instalar</string>
    <string name="MailDialog">Para continuar, você precisa instalar K9-Mail primeiro.\nPor favor, selecione instalar para continuar com a instalação no F-Droid.</string>
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@ -3,7 +3,7 @@
    <string name="action_home">Home</string>
    <string name="action_mail">Email</string>
    <string name="action_cloud">Cloud</string>
-    <string name="action_diaspora">Diaspora*</string>
+    <string name="action_akkoma">Akkoma</string>
    <string name="action_forum">Fórum</string>
    <string name="action_chat">Chat</string>
    <string name="action_pad">Etherpad</string>
@ -73,8 +73,8 @@
    <string name="DisrootWeb">Disroot web</string>
    <string name="FirstTitle">Quase que me esquecia</string><!-- need update -->
    <string name="FirstInfo">Podes carregar por alguns segundos em cada ícone para aparecer informação extra…</string><!-- need update -->
-    <string name="DiasporaTitle">Definições do Diaspora*</string>
-    <string name="DiasporaInfo">Rede social Distribuída e Descentralizada. Postar, partilhar, criar comunidades.\n\nUsername:\n o_seu_nome_de_utilizador_no_diaspora@pod.disroot.org\n\nPassword:\n a_sua_password_diaspora</string>
+    <string name="AkkomaTitle">Definições do Akkoma</string>
+    <string name="AkkomaInfo">Rede social Distribuída e Descentralizada. Postar, partilhar, criar comunidades.\n\nUsername:\n o_seu_nome_de_utilizador_no_diaspora@fe.disroot.org\n\nPassword:\n a_sua_password_diaspora</string>
    <string name="PadInfo">Com o Etherpad pode escrever artigos, comunicados de imprensa, listas de tarefas, etc. em conjunto com outras pessoas, amigos, colegas, todos a trabalhar no mesmo documento ao mesmo tempo.\nNão é necessário ter uma conta de utilizador para usar.</string>
    <string name="PadTitle">Sobre EtherPad</string>
    <string name="ChatTitle">Definições do XMPP\n</string>
@ -106,7 +106,7 @@
    <string name="logo">Logo</string>
    <string name="xmppBtn"> \ \ &#8226; State no xmpp</string>
    <string name="matrixBtn"> \ \ &#8226; State no Matrix</string>
-    <string name="SocialBtn"> \ \ &#8226; State no hubzilla/diaspora/mastodon</string>
+    <!--<string name="SocialBtn"> \ \ &#8226; State no Fe.disroot</string>-->
    <string name="NewsBtn"> \ \ &#8226; State notificações via email</string>
    <string name="RssBtn"> \ \ &#8226; State no feed de RSS</string>
    <string name="ChooseChatTitle">Você tem dois clientes de XMPP instalados!</string>
@ -119,7 +119,7 @@
    <string name="title_activity_tap">TapActivity</string>
    <string name="action_clear_cookies">Limpar os cookies</string>
    <string name="DiaInstallTitle">Pedido de instalação</string>
-    <string name="DiasporaDialog">Para continuar é necessário instalar o Dandelion.\nCarregue em instalar para continuar com a instalação do Dandelion a partir do F-Droid.</string>
+    <string name="AkkomaDialog">Para continuar é necessário instalar o Fedilab.\nCarregue em instalar para continuar com a instalação do Fedilab a partir do F-Droid.</string>
    <string name="global_cancel">Cancelar</string>
    <string name="global_install">Instalar</string>
    <string name="MailDialog">Para continuar é necessário instalar o K9-Mail.\nCarregue em instalar para continuar com a instalação do K9-Mail a partir do F-Droid.</string>
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@ -3,7 +3,7 @@
    <string name="action_home">Početna</string>
    <string name="action_mail">E-pošta</string>
    <string name="action_cloud">Oblak</string>
-    <string name="action_diaspora">Diaspora*</string>
+    <string name="action_akkoma">Akkoma</string>
    <string name="action_forum">Forum</string>
    <string name="action_chat">Ćaskanje</string>
    <string name="action_pad">Etherpad</string>
@ -74,8 +74,8 @@
    <string name="DisrootWeb">Disroot sajt</string>
    <string name="FirstTitle">Još nešto!</string>
    <string name="FirstInfo">&#8226; Duži pritisak na bilo koju ikonicu prikazaće dodatne informacije… \n\n&#8226; Aplikacija se može uskladiti sa statusnom stranicom Disroot sajta. To znači da ćete u realnom vremenu dobijati poruke o problemima, zastojima, zakazanom održavanju i sl. putem https://state.disroot.org\nPreporučujemo da isključite optimizaciju baterije i dozvolite aplikaciji da radi u pozadini. Ako niste sigurni, podešavanja možete izmeniti iz menija Disroot aplikacije. </string>
-    <string name="DiasporaTitle">Diaspora* podešavanja</string>
-    <string name="DiasporaInfo">Raspodeljena i decentralizovana društvena mreža. Objavite, delite, stvarajte zajednice.\n\nKorisnik:\n vaše_diaspora_korisničko_ime@pod.disroot.org\n\nLozinka:\n vaša_diaspora_lozinka</string>
+    <string name="AkkomaTitle">Diaspora* podešavanja</string>
+    <string name="AkkomaInfo">Raspodeljena i decentralizovana društvena mreža. Objavite, delite, stvarajte zajednice.\n\nKorisnik:\n vaše_disroot_korisničko_ime@fe.disroot.org\n\nLozinka:\n vaša_disroot_lozinka</string>
    <string name="PadInfo">Pomoću Etherpad-a pišite članke, medijske objave, podsetnike, itd. Zajedno sa prijateljima, kolegama sa fakulteta ili saradnicima, možete istovremeno raditi na određenom dokumentu.\nRegistracija nije potrebna.</string>
    <string name="PadTitle">EtherPad detalji</string>
    <string name="ChatTitle">XMPP podešavanja\n</string>
@ -107,7 +107,7 @@
    <string name="logo">Logo</string>
    <string name="xmppBtn"> \ \ &#8226; Stanje XMPP-a</string>
    <string name="matrixBtn"> \ \ &#8226; Stanje Matrix-a</string>
-    <string name="SocialBtn"> \ \ &#8226; Stanje hubzilla/diaspora/mastodon servisa</string>
+    <!--<string name="SocialBtn"> \ \ &#8226; Stanje Fe.disroot servisa</string>-->
    <string name="NewsBtn"> \ \ &#8226; Novosti o stanju putem imejla</string>
    <string name="RssBtn"> \ \ &#8226; Stanje putem RSS-a</string>
    <string name="ChooseChatTitle">Instalirana su dva XMPP korisnička programa!</string>
@ -120,7 +120,7 @@
    <string name="title_activity_tap">TapActivity</string>
    <string name="action_clear_cookies">Obriši kolačiće</string>
    <string name="DiaInstallTitle">Potrebna instalacija</string>
-    <string name="DiasporaDialog">Za nastavak je potrebno instalirati aplikaciju Dandelion.\nIzaberite \'instaliraj\' i preuzmite aplikaciju pomoću F-Droid-a.</string>
+    <string name="AkkomaDialog">Za nastavak je potrebno instalirati aplikaciju Fedilab.\nIzaberite \'instaliraj\' i preuzmite aplikaciju pomoću F-Droid-a.</string>
    <string name="global_cancel">Otkaži</string>
    <string name="global_install">Instaliraj</string>
    <string name="MailDialog">Za nastavak je potrebno instalirati aplikaciju K9-Mail.\nIzaberite \'instaliraj\' i preuzmite aplikaciju pomoću F-Droid-a.</string>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -3,7 +3,7 @@
    <string name="action_home">Home</string>
    <string name="action_mail">Mail</string>
    <string name="action_cloud">Cloud</string>
-    <string name="action_diaspora">Diaspora*</string>
+    <string name="action_akkoma">Akkoma</string>
    <string name="action_forum">Forum</string>
    <string name="action_chat">Chat</string>
    <string name="action_pad">Pad</string>
@ -67,8 +67,8 @@
    <string name="DisrootWeb">Disroot web</string>
    <string name="FirstTitle">Last couple of things!</string>
    <string name="FirstInfo">&#8226; By doing a long press on each icon you can get extra information… \n\n&#8226; The app can sync with the status page of Disroot. This means that you will receive realtime updates on issues, downtimes, scheduled maintenance and others published via https://status.disroot.org\nWe recommend to turn off battery optimization and allow Disroot app to run in the background. If you\'re not sure, you can always change the setting from the Disroot app menu later.</string>
-    <string name="DiasporaTitle">Diaspora* Settings</string>
-    <string name="DiasporaInfo">Distributed and decentralized social network. Post, share, like, create communities.\n\nUsername:\n your_diaspora_username@pod.disroot.org\n\nPassword:\n your_diaspora_password</string>
+    <string name="AkkomaTitle">Akkoma Settings</string>
+    <string name="AkkomaInfo">Distributed and decentralized social network. Post, share, like, create communities.\n\nUsername:\n your_disroot_username@fe.disroot.org\n\nPassword:\n your_disroot_password</string>
    <string name="PadInfo">With Etherpad write articles, press releases, to-do lists, etc. together with friends, fellow students or colleagues, all working on the same document at the same time.\nNo registration is required.</string>
    <string name="PadTitle">EtherPad Info</string>
    <string name="ChatTitle">XMPP Settings\n</string>
@ -100,7 +100,7 @@
    <string name="logo">Logo</string>
    <string name="xmppBtn"> \ \ &#8226; State on xmpp</string>
    <string name="matrixBtn"> \ \ &#8226; State on Matrix</string>
-    <string name="SocialBtn"> \ \ &#8226; State on Hubzilla/diaspora/mastodon</string>
+    <!--<string name="SocialBtn"> \ \ &#8226; State on Fe.disroot</string>-->
    <string name="NewsBtn"> \ \ &#8226; State updates via email</string>
    <string name="RssBtn"> \ \ &#8226; State RSS feed</string>
    <string name="ChooseChatTitle">You have two XMPP clients installed!</string>
@ -113,7 +113,7 @@
    <string name="title_activity_tap">TapActivity</string>
    <string name="action_clear_cookies">Clear cookies</string>
    <string name="DiaInstallTitle">Installation request</string>
-    <string name="DiasporaDialog">To continue you need to install Dandelion first.\nPlease select install to continue with the installation on F-Droid.</string>
+    <string name="Akkomadialog">To continue you need to install Fedilab first.\nPlease select install to continue with the installation on F-Droid.</string>
    <string name="global_cancel">Cancel</string>
    <string name="global_install">Install</string>
    <string name="MailDialog">To continue you need to install K9-Mail first.\nPlease select install to continue with the installation on F-Droid.</string>
--- a/app/src/main/res/xml/changelog_master.xml
+++ b/app/src/main/res/xml/changelog_master.xml
@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog>
+    <release version="2.0.8" versioncode="31" >
+        <change>Added Akkoma</change>
+        <change>General Information Update</change>
+    </release>
    <release version="2.0.7" versioncode="30" >
        <change>Correction of informative state messages</change>
    </release>
@ -16,17 +20,17 @@
        <change>Solved installed apps check for Android 11 and higher</change>
        <change>Updated SDK and gradle</change>
    </release>
-  <release version="2.0.3" versioncode="26" >
-      <change>Changed to new git repo</change>
-      <change>Updated Constant variables with new git URL</change>
-  </release>
-  <release version="2.0.2" versioncode="25" >
-      <change>prevent deck url's to be opened in this app, but open deck app instead</change>
-      <change>Added additional info about all services from disroot state's cachet api</change>
-  </release>
-  <release version="2.0.1" versioncode="24" >
-      <change>Scheduled at: to be shown only on planned issues</change>
-  </release>
+    <release version="2.0.3" versioncode="26" >
+        <change>Changed to new git repo</change>
+        <change>Updated Constant variables with new git URL</change>
+    </release>
+    <release version="2.0.2" versioncode="25" >
+        <change>prevent deck url's to be opened in this app, but open deck app instead</change>
+        <change>Added additional info about all services from disroot state's cachet api</change>
+    </release>
+    <release version="2.0.1" versioncode="24" >
+        <change>Scheduled at: to be shown only on planned issues</change>
+    </release>
    <release version="2.0.0" versioncode="23" >
        <change>New theme and icon sets</change>
        <change>New settings menu</change>
@ -40,42 +44,42 @@
        <change>Made application info fully translatable</change>
        <change>Made Device info fully translatable</change>
    </release>
-  <release version="1.2.2" versioncode="21" >
-      <change>Removed battery optimization prompt on updates</change>
-      <change>Corrected links in description in F-droid</change>
-      <change>Added Sr and De translations of the description in F-Droid</change>
-      <change>Spanish en German translation updated</change>
-  </release>
+    <release version="1.2.2" versioncode="21" >
+        <change>Removed battery optimization prompt on updates</change>
+        <change>Corrected links in description in F-droid</change>
+        <change>Added Sr and De translations of the description in F-Droid</change>
+        <change>Spanish en German translation updated</change>
+    </release>
    <release version="1.2.1" versioncode="20" >
        <change>Updated the need more help links to the actual How to's</change>
        <change>Added some screenshots in F-Droid app description</change>
        <change>Added It, Nl,De and Fr translations of the description in F-Droid</change>
        <change>Spanish translation updated</change>
    </release>
-  <release version="1.2.0" versioncode="19" >
-      <change>Notifications works as a service now</change>
-      <change>Added shortcut to battery optimizations in menu</change>
-      <change>Prompt for battery optimization to give user choice on first launch</change>
-      <change>Launch status service on boot time when battery optimization is turned off</change>
-      <change>Added German translation</change>
-      <change>Updated link to the chat How to</change>
-  </release>
-  <release version="1.1.5" versioncode="18" >
-      <change>Notifications works on Android 8 and higher now</change>
-      <change>Added Disroot purple light notification</change>
-      <change>Updated Serbian translation</change>
-  </release>
-  <release version="1.1.4" versioncode="17" >
-      <change>Fixed App closing when pressing go back</change>
-      <change>Edited state error message</change>
-      <change>Updated links to more help</change>
-  </release>
+    <release version="1.2.0" versioncode="19" >
+        <change>Notifications works as a service now</change>
+        <change>Added shortcut to battery optimizations in menu</change>
+        <change>Prompt for battery optimization to give user choice on first launch</change>
+        <change>Launch status service on boot time when battery optimization is turned off</change>
+        <change>Added German translation</change>
+        <change>Updated link to the chat How to</change>
+    </release>
+    <release version="1.1.5" versioncode="18" >
+        <change>Notifications works on Android 8 and higher now</change>
+        <change>Added Disroot purple light notification</change>
+        <change>Updated Serbian translation</change>
+    </release>
+    <release version="1.1.4" versioncode="17" >
+        <change>Fixed App closing when pressing go back</change>
+        <change>Edited state error message</change>
+        <change>Updated links to more help</change>
+    </release>
    <release version="1.1.3" versioncode="16" >
        <change>Fixed string on Etherpad dialog</change>
    </release>
-      <release version="1.1.2" versioncode="15" >
-          <change>Fixed layout for small screens</change>
-      </release>
+    <release version="1.1.2" versioncode="15" >
+        <change>Fixed layout for small screens</change>
+    </release>
    <release version="1.1.1" versioncode="14" >
        <change>Added more info for notes app</change>
        <change>Corrected some typos</change>
@ -105,17 +109,17 @@
        <change>Workaround for app crashing when uploading in Lufi</change>
    </release>
    <release version="1.0.0" versioncode="10" >
-      <change>Added Serbian translation</change>
-      <change>Fixed changelog</change>
-      <change>Pushed V1.0.0</change>
-  </release>
-  <release version="0.9.4" versioncode="9" >
-      <change>Added Portuguese translation</change>
-  </release>
-  <release version="0.9.3" versioncode="8" >
-      <change>Fixed chatroom redirection</change>
-      <change>Added Dutch translation</change>
-  </release>
+        <change>Added Serbian translation</change>
+        <change>Fixed changelog</change>
+        <change>Pushed V1.0.0</change>
+    </release>
+    <release version="0.9.4" versioncode="9" >
+        <change>Added Portuguese translation</change>
+    </release>
+    <release version="0.9.3" versioncode="8" >
+        <change>Fixed chatroom redirection</change>
+        <change>Added Dutch translation</change>
+    </release>
    <release version="0.9.2" versioncode="7" >
        <change>Fixed cloud tip</change>
        <change>Fixed app crash on tapping mail icon</change>
--- a/metadata/en
+++ b/metadata/en
@ -1 +0,0 @@
-en-US
--- a/metadata/en
+++ b/metadata/en
@ -0,0 +1 @@
+en-US