Update app/src/main/res/xml/changelog_master.xml

app/build.gradle

@@ -6,8 +6,8 @@ android {
         applicationId "org.disroot.disrootapp"
         minSdkVersion 16
         targetSdkVersion 32
-        versionCode 31
-        versionName "2.0.8"
+        versionCode 33
+        versionName "2.1.1"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

app/src/main/AndroidManifest.xml

@@ -2,6 +2,10 @@
 <manifest xmlns:tools="http://schemas.android.com/tools"
     xmlns:android="http://schemas.android.com/apk/res/android">
 
+    <uses-feature
+        android:name="android.hardware.camera"
+        android:required="false" />
+
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
@@ -23,6 +27,7 @@
         android:dataExtractionRules="@xml/data_extraction_rules"
         tools:targetApi="s">
 
+        <!--// status service disabled
         <receiver
             android:name=".StatusBroadcastReceiver"
             android:enabled="true"
@@ -31,12 +36,11 @@
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
             </intent-filter>
         </receiver>
-
         <service
             android:name=".StatusService"
             android:enabled="true"
             android:exported="false" />
-
+        -->
         <activity
             android:name="org.disroot.disrootapp.ui.SplashScreenActivity"
             android:configChanges="orientation|screenSize"
@@ -92,10 +96,12 @@
             android:name=".ui.StateActivity"
             android:label="@string/title_activity_state"
             android:theme="@style/DisTheme" />
+        <!--// status service disabled
         <activity
             android:name=".ui.StateMessagesActivity"
             android:label="@string/title_activity_state"
             android:theme="@style/DisTheme" />
+            -->
         <activity
             android:name=".ui.SettingsActivity"
             android:label="@string/settings"

app/src/main/java/org/disroot/disrootapp/ui/MainActivity.java

@@ -145,7 +145,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
             }
         } );
         componentList = new ArrayList<>();
-        new GetList().execute();
+        //new GetList().execute();
 
         setupWebView(savedInstanceState, frameLayoutContainer);
         //settings
@@ -167,9 +167,9 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
         BtnPreference = getSharedPreferences( "UserBtn", Context.MODE_PRIVATE );//user
         BtnPreference = getSharedPreferences( "HowToBtn", Context.MODE_PRIVATE );//howTo
         BtnPreference = getSharedPreferences( "AboutBtn", Context.MODE_PRIVATE );//about
-        //Status service
-        Intent intent = new Intent( MainActivity.this, StatusService.class);
-        startService(intent);
+        // status service disabled
+        //Intent intent = new Intent( MainActivity.this, StatusService.class);
+        //startService(intent);
 
         //progressbarLoading
         progressBar = findViewById(R.id.progressbarLoading);
@@ -197,6 +197,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
 
         //ckCangelog library
         ChangeLog cl = new ChangeLog(this);
+        //Battery optimization
         if (cl.isFirstRun()) {
             cl.getLogDialog().show();
         }
@@ -413,9 +414,15 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
                     webView.loadUrl(Constants.URL_DisApp_USER);
                     hideDashboard();
                     break;
+                // status service disabled
+                    /*
                 case R.id.StateBtn:
                     Intent goState = new Intent(MainActivity.this, StateActivity.class);
                     MainActivity.this.startActivity(goState);
+                    break;*/
+                case R.id.StateBtn:
+                    webView.loadUrl(Constants.URL_DisApp_STATE);
+                    hideDashboard();
                     break;
                 case R.id.HowToBtn:
                     webView.loadUrl(Constants.URL_DisApp_HOWTO);
@@ -544,12 +551,14 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
         builder.setCancelable(false);
         builder.setTitle(R.string.FirstTitle);
         builder.setMessage(getString(R.string.FirstInfo));
-        builder.setPositiveButton(R.string.global_ok,  new DialogInterface.OnClickListener() {
+        builder.setPositiveButton(R.string.global_ok,null);
+        // status service disabled
+        /*builder.setPositiveButton(R.string.global_ok,  new DialogInterface.OnClickListener() {
             @Override
             public void onClick(DialogInterface dialog, int which) {
                 showOptimzation();
             }
-        });
+        });*/
         builder.show();
     }
 
@@ -1245,9 +1254,13 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
         if (keyCode == KeyEvent.KEYCODE_BACK) {
             if (disWebChromeClient.hideCustomView()) {
                 return true;
-            } else if (!disWebChromeClient.hideCustomView() && webView.canGoBack()) {
+            } if (!disWebChromeClient.hideCustomView() && webView.canGoBack()&&webView.copyBackForwardList().getCurrentIndex()>1){
+                Log.e(TAG, "CanGoBack" );
                 webView.goBack();
                 return true;
+            } else
+            {
+                webView.goBack();
             }
         }
         return super.onKeyDown(keyCode, event);
@@ -1326,9 +1339,11 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
                 webView.loadUrl(url);
                 return true;
             }
-            case R.id.action_optimization:
+            //Status service disabled
+            /*case R.id.action_optimization:
                 showOptimzation();
                 return true;
+            */
             case R.id.action_about:
                 Intent goAbout = new Intent(MainActivity.this, AboutActivity.class);
                 MainActivity.this.startActivity(goAbout);
@@ -1375,6 +1390,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
         webView.getSettings().setCacheMode(WebSettings.LOAD_DEFAULT);
         webView.getSettings().setDatabaseEnabled(true);
         webView.setOnLongClickListener(this);
+        webView.loadData( "","text/html","utf-8" );
 
         //enable cookies
         cookieManager = CookieManager.getInstance();
@@ -1769,7 +1785,8 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
 
 
     //components
-    @SuppressLint("StaticFieldLeak")
+    // status service disabled
+    /*@SuppressLint("StaticFieldLeak")
     class GetList extends AsyncTask<Void, Void, Void> {
         protected Void doInBackground(Void... arg0) {
             HttpHandler sh = new HttpHandler();
@@ -1906,6 +1923,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
             }
         }
     }
+    */
 
     private void getEmail(String string){
         email = string;

app/src/main/java/org/disroot/disrootapp/ui/SettingsActivity.java

@@ -45,7 +45,7 @@ public class SettingsActivity extends AppCompatActivity {
         toolbar.setNavigationIcon( R.drawable.ic_arrow_back );
         toolbar.setNavigationOnClickListener( v -> onBackPressed() );
 
-        ////buttons visibility preference list
+        //buttons visibility preference list
         BtnPreference = getSharedPreferences( "MailBtn", Context.MODE_PRIVATE );//mail
         BtnPreference = getSharedPreferences( "CloudBtn", Context.MODE_PRIVATE );//cloud
         BtnPreference = getSharedPreferences( "ChatBtn", Context.MODE_PRIVATE );//chat

app/src/main/java/org/disroot/disrootapp/utils/Constants.java

@@ -63,4 +63,5 @@ public class Constants {
     public static final int FILECHOOSER_RESULTCODE = 1;//file upload
     public static final String TAG = MainActivity.class.getSimpleName();
     public static final String components = "https://status.disroot.org/index.json";
+    public static String URL_DisApp_STATE = "https://status.disroot.org/";
 }

app/src/main/res/menu/menu_main.xml

@@ -31,10 +31,12 @@
         android:icon="@drawable/ic_clear_cookies"
         android:id="@+id/action_clear_cookies"
         android:title="@string/action_clear_cookies" />
+        <!--// status service disabled
         <item
             android:icon="@drawable/ic_battery"
             android:id="@+id/action_optimization"
             android:title="@string/action_optimization" />
+        -->
         <item
             android:icon="@drawable/ic_settings"
             android:id="@+id/action_set_icons"

app/src/main/res/values-de/strings.xml

@@ -60,7 +60,8 @@
     <string name="SpreadTheWordBtn">Teile die App</string>
     <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="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="FirstInfo">&#8226; Wenn du lange auf ein Icon drückst, erhältst du weitere Informationen…</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="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>

app/src/main/res/values-es/strings.xml

@@ -72,7 +72,8 @@
     <string name="SpreadTheWordBtn">Compartir la aplicación</string>
     <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="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="FirstInfo">&#8226; Haciendo una presión larga sobre cada ícono, puedes obtener información adicional…</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="PadInfo">EtherPad</string>

app/src/main/res/values-fr/strings.xml

@@ -96,7 +96,8 @@
     <string name="SpreadTheWordBtn">Partager l\'application</string>
     <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="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="FirstInfo"><![CDATA[• En appuyant longuement sur chaque icône, vous pouvez obtenir des informations supplémentaires…]]></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.
 \n

app/src/main/res/values-it/strings.xml

@@ -60,7 +60,8 @@
     <string name="SpreadTheWordBtn">Condividi la app</string>
     <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="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="FirstInfo">&#8226; È possibile premere a lungo su ogni icona per visualizzare informazioni aggiuntive…</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="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>

app/src/main/res/values-nl/strings.xml

@@ -72,7 +72,8 @@
     <string name="SpreadTheWordBtn">Deel de app</string>
     <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="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="FirstInfo">&#8226; Je kan op elk pictogram lang drukken om jou extra informatie te tonen…</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="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>

app/src/main/res/values-pt-rBR/strings.xml

@@ -64,7 +64,8 @@
     <string name="SpreadTheWordBtn">Compartilhar o App</string>
     <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="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="FirstInfo">&#8226; Ao pressionar e segurar cada ícone, você pode obter mais informações…</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="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>

app/src/main/res/values-pt/strings.xml

@@ -71,7 +71,7 @@
     <string name="SpreadTheWordBtn">Partilhar a app</string>
     <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="FirstInfo">Podes carregar por alguns segundos em cada ícone para aparecer informação extra…</string>
     <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="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>

app/src/main/res/values-sr/strings.xml

@@ -72,7 +72,8 @@
     <string name="SpreadTheWordBtn">Podelite aplikaciju</string>
     <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="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="FirstInfo">&#8226; Duži pritisak na bilo koju ikonicu prikazaće dodatne informacije…</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="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>

app/src/main/res/values/strings.xml

@@ -64,7 +64,8 @@
     <string name="SpreadTheWordBtn">Share the app</string>
     <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="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="FirstInfo">&#8226; By doing a long press on each icon you can get extra information…</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="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>

app/src/main/res/xml/changelog_master.xml

@@ -1,5 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog>
+    <release version="2.1.1" versioncode="33" >
+        <change>Removal of state messages</change>
+        <change>Status now redirects to web page instead of integrated status list</change>
+        <change>Fix Back press on Webview</change>
+    </release>
+    <release version="2.0.9" versioncode="32" >
+        <change>missed tag</change>
+    </release>
     <release version="2.0.8" versioncode="31" >
         <change>Removal of Forum and Board</change>
         <change>Correction of Disroot Calls variables</change>