diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml
index 6b96cf0c1a281ccd73e283f1ce6a88308c0daf49..5c6653f2f9e9627db6d8def42379021c4b182625 100644
--- a/.idea/assetWizardSettings.xml
+++ b/.idea/assetWizardSettings.xml
@@ -5,7 +5,25 @@
<map>
<entry key="vectorWizard">
<value>
- <PersistentState />
+ <PersistentState>
+ <option name="children">
+ <map>
+ <entry key="vectorAssetStep">
+ <value>
+ <PersistentState>
+ <option name="values">
+ <map>
+ <entry key="assetSourceType" value="FILE" />
+ <entry key="outputName" value="ic_forget" />
+ <entry key="sourceFile" value="$PROJECT_DIR$/../DisIcons/check-circle-o.svg" />
+ </map>
+ </option>
+ </PersistentState>
+ </value>
+ </entry>
+ </map>
+ </option>
+ </PersistentState>
</value>
</entry>
</map>
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 29f152955edbc000fd7e0fb0ddcaccd8625967d6..d95db100bb3dfaa8f14ca5c0c53a08aa9f5fdd2d 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/app/build.gradle b/app/build.gradle
index 4c442ea28f81b9f306454cd3bd9bbceb14bc1b6d..3b2a6fcaa76192bae75e13d09986d239e813c8cc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,8 +6,8 @@ android {
applicationId "org.disroot.disrootapp"
minSdkVersion 15
targetSdkVersion 28
- versionCode 4
- versionName "0.0.4"
+ versionCode 5
+ versionName "0.0.5"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
buildTypes {
diff --git a/app/src/main/java/org/disroot/disrootapp/ui/MainActivity.java b/app/src/main/java/org/disroot/disrootapp/ui/MainActivity.java
index 9041bf222d601e12fd69756466db10e1323553e5..6ff362c4c474e3ab9238e065d90920d2ee2e00dd 100644
--- a/app/src/main/java/org/disroot/disrootapp/ui/MainActivity.java
+++ b/app/src/main/java/org/disroot/disrootapp/ui/MainActivity.java
@@ -24,9 +24,6 @@ import android.support.v4.app.ActivityCompat;
import android.support.v4.content.ContextCompat;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
-import android.text.SpannableString;
-import android.text.method.LinkMovementMethod;
-import android.text.util.Linkify;
import android.util.Log;
import android.view.KeyEvent;
import android.view.LayoutInflater;
@@ -44,11 +41,12 @@ import android.webkit.WebChromeClient;
import android.webkit.WebView;
import android.webkit.WebViewClient;
import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.CompoundButton;
import android.widget.FrameLayout;
import android.widget.ImageButton;
import android.widget.ProgressBar;
import android.widget.ScrollView;
-import android.widget.TextView;
import android.widget.Toast;
@@ -76,6 +74,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
private DisWebChromeClient disWebChromeClient;
Button button;
SharedPreferences firstStart = null;//first start
+ SharedPreferences check = null;
private static final int INPUT_FILE_REQUEST_CODE = 1;//file upload
private static final int FILECHOOSER_RESULTCODE = 1;
String loadUrl;
@@ -107,6 +106,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
//ViewGroup viewLoading = (ViewGroup) findViewById(R.id.linearlayout_view_loading_container);
setupWebView(savedInstanceState, frameLayoutContainer);
firstStart = getSharedPreferences("org.disroot.disrootap", MODE_PRIVATE);//fisrt start
+ check = getSharedPreferences("org.disroot.disrootapp", MODE_PRIVATE);
// enables the activity icon as a 'home' button. required if "android:targetSdkVersion" > 14
//getActionBar().setHomeButtonEnabled(true);
@@ -261,13 +261,23 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
xmpp1 = new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id="+Conversations));
}
/* if((xmpp1 == null)&&(xmpp2 != null)) { */
- if(xmpp1 == null) {
+ if((xmpp1 == null)&&(xmpp2 != null)) {//if(xmpp1 == null) {
startActivity(xmpp2);
}
- //need to change to give user choise
+ //need to change to give user choise || check.getBoolean("checkPix",false)
if((xmpp1 != null)&&(xmpp2 != null)) {
- startActivity(xmpp2);
- }
+ if(check.getBoolean("checkConv", true)) {
+ startActivity(xmpp1);
+ return;
+ }
+ if(check.getBoolean("checkPix", true)) {
+ startActivity(xmpp2);
+ return;
+ }
+ else
+ showChoose();
+ return;
+ }
//first time tap check
if (firstStart.getBoolean("firsttap", true)){
showFirstTap();
@@ -553,6 +563,54 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
}
//Dialog windows
+ private void showChoose() {
+ AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this);
+ //builder.setCancelable(false);
+ builder.setTitle(R.string.ChooseChatTitle)
+ .setMessage(R.string.ChooseChat);
+ //LayoutInflater inflater = getLayoutInflater();
+ View view = View.inflate(this, R.layout.check_remember, null);
+ final CheckBox checkChat = (CheckBox) view.findViewById(R.id.checkChat);
+ checkChat.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+ @Override
+ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+
+ }
+ });
+ builder.setPositiveButton(R.string.Conversations, new DialogInterface.OnClickListener() {
+ String Conversations = "eu.siacs.conversations";
+ Intent xmpp1 = getPackageManager().getLaunchIntentForPackage(Conversations);
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ if (((CheckBox) checkChat).isChecked()) {
+ check.edit().putBoolean("checkConv", true).apply();
+ startActivity(xmpp1);
+ return;
+ }
+ else
+ startActivity(xmpp1);
+ return;
+ }
+ });
+ builder.setNegativeButton(R.string.PixArt, new DialogInterface.OnClickListener() {
+ String PixArt = "de.pixart.messenger";
+ Intent xmpp2 = getPackageManager().getLaunchIntentForPackage(PixArt);
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ if (((CheckBox) checkChat).isChecked()) {
+ check.edit().putBoolean("checkPix", true).apply();
+ startActivity(xmpp2);
+ return;
+ }
+ else
+ startActivity(xmpp2);
+ return;
+ }
+ });
+ builder.setView(view);
+ builder.show();
+ }
+
private void showFirstTap() {
AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this);
builder.setCancelable(false);
@@ -567,6 +625,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
Toast.makeText(view.getContext(), R.string.activity_main_share_info, Toast.LENGTH_LONG).show();
return false;
}
+
//Mail Info
private void showMailInfo() {
final ScrollView dashboard = findViewById(R.id.dashboard);
@@ -640,12 +699,46 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
builder.show();
}
+ private void showForget() {
+ final ScrollView dashboard = findViewById(R.id.dashboard);
+ AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this);
+ builder.setCancelable(false);
+ builder.setTitle(R.string.ForgetTitle);
+ if(check.getBoolean("checkConv", true)|| check.getBoolean("checkPix",true)) {
+ View view = View.inflate(this, R.layout.check_forget, null);
+ final CheckBox forgetChat = (CheckBox) view.findViewById(R.id.forgetChat);
+ forgetChat.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+ @Override
+ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+ check.edit().putBoolean("checkConv", false).apply();
+ check.edit().putBoolean("checkPix", false).apply();
+ }
+ });
+ builder.setView(view);
+ }
+ builder.setPositiveButton(R.string.global_ok, null);
+ builder.show();
+ }
+
private void showChatInfo() {
final ScrollView dashboard = findViewById(R.id.dashboard);
AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this);
builder.setCancelable(false);
builder.setTitle(R.string.ChatTitle);
builder.setMessage(getString(R.string.ChatInfo));
+ // ||check.getBoolean("checkPix", true)==true
+ if(check.getBoolean("checkConv", true)|| check.getBoolean("checkPix",true)) {
+ View view = View.inflate(this, R.layout.check_forget, null);
+ final CheckBox forgetChat = (CheckBox) view.findViewById(R.id.forgetChat);
+ forgetChat.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+ @Override
+ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+ check.edit().putBoolean("checkConv", false).apply();
+ check.edit().putBoolean("checkPix", false).apply();
+ }
+ });
+ builder.setView(view);
+ }
builder.setPositiveButton(R.string.global_ok, null);
builder.setNegativeButton(R.string.more_help, new DialogInterface.OnClickListener() {
@Override
@@ -665,7 +758,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
builder.setTitle(R.string.PadTitle);
builder.setMessage(getString(R.string.PadInfo));
builder.setPositiveButton(R.string.global_ok, null);
- builder.setNegativeButton(R.string.more_help, new DialogInterface.OnClickListener() {
+ builder.setNegativeButton(R.string.tell_more, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
webView.loadUrl(Constants.URL_DisApp_PADHELP);
@@ -683,7 +776,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
builder.setTitle(R.string.CalcTitle);
builder.setMessage(getString(R.string.CalcInfo));
builder.setPositiveButton(R.string.global_ok, null);
- builder.setNegativeButton(R.string.more_help, new DialogInterface.OnClickListener() {
+ builder.setNegativeButton(R.string.tell_more, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
webView.loadUrl(Constants.URL_DisApp_CALCHELP);
@@ -719,7 +812,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
builder.setTitle(R.string.UploadTitle);
builder.setMessage(getString(R.string.UploadInfo));
builder.setPositiveButton(R.string.global_ok, null);
- builder.setNegativeButton(R.string.tell_more, new DialogInterface.OnClickListener() {
+ builder.setNegativeButton(R.string.more_help, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
webView.loadUrl(Constants.URL_DisApp_UPLOADHELP);
@@ -786,10 +879,10 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
private void showUserInfo() {
AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this);
- builder.setCancelable(false);
- builder.setTitle(R.string.UserTitle);
- builder.setMessage(getString(R.string.UserInfo));
- builder.setPositiveButton(R.string.global_ok, null);
+ builder.setCancelable(false)
+ .setTitle(R.string.UserTitle)
+ .setMessage(getString(R.string.UserInfo))
+ .setPositiveButton(R.string.global_ok, null);
builder.show();
}
@@ -1006,12 +1099,26 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
return super.onKeyDown(keyCode, event);
}
+ public boolean onPrepareOptionsMenu(Menu menu)
+ {
+ MenuItem register = menu.findItem(R.id.action_forget);
+ if(check.getBoolean("checkConv", true)||check.getBoolean("checkPix", true)) {
+ register.setVisible(true);
+ }
+ else
+ {
+ register.setVisible(false);
+ }
+ return true;
+ }
+
@Override
public boolean onCreateOptionsMenu(Menu menu) {
// Inflate the menu items for use in the action bar
MenuInflater inflater = getMenuInflater();
inflater.inflate(R.menu.menu_main, menu);
+
// To show icons in the actionbar's overflow menu:
// http://stackoverflow.com/questions/18374183/how-to-show-icons-in-overflow-menu-in-actionbar
//if(featureId == Window.FEATURE_ACTION_BAR && menu != null){
@@ -1066,6 +1173,13 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
}
else
return true;
+ case R.id.action_forget: {
+ if(check.getBoolean("checkConv", true)||check.getBoolean("checkPix", true)) {
+ setVisible(true);
+ showForget();
+
+ }
+ }
case R.id.action_reload: {
String url = webView.getUrl();
webView.loadUrl(url);
diff --git a/app/src/main/java/org/disroot/disrootapp/utils/Constants.java b/app/src/main/java/org/disroot/disrootapp/utils/Constants.java
index bff7355fb7293d09e53cf304e110133493b01275..e07aa4af7178a283229c0791a04b76078061324a 100644
--- a/app/src/main/java/org/disroot/disrootapp/utils/Constants.java
+++ b/app/src/main/java/org/disroot/disrootapp/utils/Constants.java
@@ -41,8 +41,8 @@ public class Constants {
public static final String URL_DisApp_FORUMHELP = "https://howto.disroot.org/forum";
public static final String URL_DisApp_PADHELP = "https://disroot.org/services/pads";
public static final String URL_DisApp_CALCHELP = "https://disroot.org/services/pads";
- public static final String URL_DisApp_BINHELP = "https://howto.disroot.org/pads_and_bins";
- public static final String URL_DisApp_UPLOADHELP = "https://disroot.org/services/upload";
+ public static final String URL_DisApp_BINHELP = "https://howto.disroot.org/en/pads_and_bins/privatebin";
+ public static final String URL_DisApp_UPLOADHELP = "https://howto.disroot.org/en/lufi";
public static final String URL_DisApp_POLLHELP = "https://howto.disroot.org/polls";
public static final String URL_DisApp_BOARDHELP = "https://disroot.org/services/project-board";
}
diff --git a/app/src/main/res/drawable/ic_forget.xml b/app/src/main/res/drawable/ic_forget.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c7986b242b293bda00671d4be39384da3a157e78
--- /dev/null
+++ b/app/src/main/res/drawable/ic_forget.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:viewportHeight="48"
+ android:viewportWidth="48" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+ <path android:fillAlpha="1" android:fillColor="#ffffff"
+ android:pathData="m36.5938,21.4063 l-13.1875,13.1875c-0.7813,0.7813 -2.0313,0.7813 -2.8125,0l-9.1875,-9.1875c-0.7813,-0.7813 -0.7813,-2.0313 0,-2.8125l3.1875,-3.1875c0.7813,-0.7813 2.0313,-0.7813 2.8125,0L22,24 30.5938,15.4063c0.7813,-0.7813 2.0313,-0.7813 2.8125,0l3.1875,3.1875c0.7813,0.7813 0.7813,2.0313 0,2.8125zM41,24C41,14.625 33.375,7 24,7 14.625,7 7,14.625 7,24c0,9.375 7.625,17 17,17 9.375,0 17,-7.625 17,-17zM48,24C48,37.25 37.25,48 24,48 10.75,48 0,37.25 0,24 0,10.75 10.75,0 24,0 37.25,0 48,10.75 48,24Z" android:strokeWidth="0.03125"/>
+</vector>
diff --git a/app/src/main/res/layout/check_forget.xml b/app/src/main/res/layout/check_forget.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e627c3195fbf3a82df7d947d81c8429047146674
--- /dev/null
+++ b/app/src/main/res/layout/check_forget.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout
+ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:id="@+id/CheckForget">
+
+ <CheckBox
+ android:id="@+id/forgetChat"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:layout_margin="@dimen/activity_horizontal_margin"
+ android:text="@string/Forget" />
+</android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/check_remember.xml b/app/src/main/res/layout/check_remember.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9c7d5af9656122cb0e87bd89f8b881e4da0ac835
--- /dev/null
+++ b/app/src/main/res/layout/check_remember.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout
+ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:id="@+id/CheckRemember">
+
+ <CheckBox
+ android:id="@+id/checkChat"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:layout_margin="@dimen/activity_horizontal_margin"
+ android:text="@string/Remember" />
+</android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_about_license.xml b/app/src/main/res/layout/fragment_about_license.xml
index b9302b70dde58c3ceca5aea539c777acf9db63c7..e887e8b50ce7a395dd9dff90bb5a1509ee35f26a 100644
--- a/app/src/main/res/layout/fragment_about_license.xml
+++ b/app/src/main/res/layout/fragment_about_license.xml
@@ -181,11 +181,6 @@
android:layout_height="wrap_content"
android:text="@string/thirdpartyText"/>
- <org.disroot.disrootapp.ui.HtmlTextView
- android:id="@+id/thirdpartyText"
- android:textAppearance="@style/TextAppearance.AppCompat"
- android:layout_width="match_parent"
- android:layout_height="wrap_content" />
</LinearLayout>
</android.support.v7.widget.CardView>
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index b0a99d92b5b4fa633c8e6a5c394bd096f722383d..9e3a97d0adfdd41db48f36271cfa87d94383a98d 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -7,17 +7,22 @@
android:id="@+id/action_home"
android:icon="@drawable/ic_home"
android:title="@string/action_home"
- app:showAsAction="always"/>
+ app:showAsAction="ifRoom"/>
<item
android:id="@+id/action_share"
android:orderInCategory="1"
android:title="@string/action_share"
android:icon="@drawable/ic_share_white_24dp"
- app:showAsAction="always" />
+ app:showAsAction="ifRoom" />
<group
android:orderInCategory="101"
app:showAsAction="never">
+ <item
+ android:icon="@drawable/ic_forget"
+ android:id="@+id/action_forget"
+ android:title="@string/Forget"
+ android:visible="false"/>
<item
android:icon="@drawable/ic_reload"
android:id="@+id/action_reload"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7831ec8f603a3270e75ef7e35864e4175ad129f0..028c2f77cf019b3085a40cec1f41cba82c64e291 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -34,11 +34,11 @@
<string name="title_activity_tap">TapActivity</string>
<string name="MailInfoTitle">Mail Settings</string>
- <string name="MailInfo">IMAP: disroot.org\nSSL Port 993\nAuthentication: Normal Password\nSMTP: disroot.org\nSTARTTLS Port 587\nAuthentication: Normal Password\nPOP: disroot.org\nSSL Port 995\nAuthentication: Normal Password</string>
+ <string name="MailInfo">IMAP: disroot.org\nSSL Port 993\nAuthentication: Normal Password\n\nSMTP: disroot.org\nSTARTTLS Port 587\nAuthentication: Normal Password\n\nPOP: disroot.org\nSSL Port 995\nAuthentication: Normal Password</string>
<string name="CloudInfoTitle">Nextcloud Settings</string>
- <string name="CloudInfo">Keep your data synchronized and safe. With Nextcloud you can share your files, calendars, contacts and more.\n\nUsername: your_username@disroot.org\nPassword:you_disroot_password.</string>
+ <string name="CloudInfo">Keep your data synchronized and safe. With Nextcloud you can share your files, calendars, contacts and more.\n\nUsername:\n your_username@disroot.org\n\nPassword:\n your_disroot_password.</string>
<string name="WelcomeTitle">Welcome</string>
- <string name="WelcomeInfo">Disroot is a platform providing online services based on principles of freedom, privacy, federation and decentralization.\nThis app is like your swiss knife to the Disroot platform, made by the community for the community.\nIf you don\'t have a Disroot account you can still use this app to access all the Disroot services that do not require an account:\n \ \ \ • Etherpad\n \ \ \ • Ethercalc\n \ \ \ • Private bin\n \ \ \ • Upload\n \ \ \ • Poll\n \ \ \ • Searx\n \ \ \ • Diaspora* (requires a Diaspora only account)\n\nThe app may require you to install additional apps. We highly recommend you install FDroid - a free and open opensource app marketplace - as not all apps can be found on Google\'s Play Store and as F-Droid is more privacy oriented (no tracking, no account needed) you can download it by tapping on the F-droid icon.\n</string>
+ <string name="WelcomeInfo">Disroot is a platform providing online services based on principles of freedom, privacy, federation and decentralization.\nThis app is like your Swiss Army knife to the Disroot platform, made by the community for the community.\nIf you don\'t have a Disroot account you can still use this app to access all the Disroot services that do not require an account:\n \ \ \ • Etherpad\n \ \ \ • Ethercalc\n \ \ \ • Private bin\n \ \ \ • Upload\n \ \ \ • Poll\n \ \ \ • Searx\n \ \ \ • Diaspora* (requires a Diaspora only account)\n\nThe app may require you to install additional apps. We highly recommend you install F-Droid - a free and open source app marketplace - as not all apps can be found on Google\'s Play Store and F-Droid is more privacy oriented (no tracking, no account needed) you can download it by tapping on the F-droid icon.\n</string>
<string name="help">Help</string>
<string name="license">License</string>
@@ -53,15 +53,15 @@
<string name="maintainersTitle">Maintainers</string>
<string name="maintainersText">This app is currently being developed and maintained by\n\n</string>
- <string name="disrootUrl"><a href = "https://disroot.org">https://disroot.org</a></string>
+ <string name="disrootUrl">https://disroot.org</string>
<string name="disroot"> * Disroot Community (Disroot):</string>
<string name="contributorsTitle">Contributors</string>
- <string name="contributors"><b>Massimiliano:</b>\n Current developer of the Disroot app</string>
+ <string name="contributors"><b> • muppeth:</b>\n Disroot admin\n\n<b> • antilopa:</b>\n Disroot admin\n\n<b> • Massimiliano:</b>\n Current developer of the Disroot app\n\n<b> • Fede:</b>\n Content contributor\n\n</string>
<string name="fDroid">F-Droid</string>
<string name="thirdparty">Third-Party Libraries</string>
<string name="thirdpartyText"><a href="https://github.com/cketti/ckChangeLog">ckCangelog: </a>Apache License 2.0\n\n<a href="https://github.com/wsdfhjxc/taponium/">Taponium: </a>GNU General Public License v3.0</string>
<string name="misc">Miscellaneous</string>
- <string name="miscDio">We used Diolinx as our starting base to create this app. Go check it out, it's free software as well!</string>
+ <string name="miscDio">We used Diolinx as our starting base to create this app. Go check it out, it\'s free software as well!</string>
<string name="miscDioBtn">Tell me more</string>
<string name="AppSection">Application</string>
<string name="AppVersion">App Version: %1$s</string>
@@ -70,7 +70,7 @@
<string name="ContributeText">Disroot app is developed free as in Freedom and follows the ideas of the Disroot Foundation. If you want to contribute, go ahead! Currently we are a very small team, so we greatly appreciate any kind of help!</string>
<string name="ContributeBtn">Get the source</string>
<string name="Translate">Translate</string>
- <string name="TranslateText">The app is not available in your language? You can change that! Why don't you help us by translating it?</string>
+ <string name="TranslateText">The app is not available in your language? You can change that! Why don\'t you help us by translating it?</string>
<string name="TranslateBtn">Let me translate</string>
<string name="Feedback">Give Feedback!</string>
<string name="FeedbackText">Disroot app is still in development, so if you have suggestions or any kind of feedback, please let us know!</string>
@@ -83,27 +83,27 @@
<string name="FirstTitle">I almost forgot</string>
<string name="FirstInfo">You can do a long press on each icon to show you extra information…</string>
<string name="DiasporaTitle">Diaspora* Settings</string>
- <string name="DiasporaInfo">Distribuited and descentralized social network. Post, share, like, create communities.\n\nUsername: your_diaspora_username@pod.disroot.org\nPassword: your_diaspora_password</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>
<string name="PadTitle">EtherPad Info</string>
<string name="ChatTitle">XMPP Settings\n</string>
- <string name="ChatInfo">Conversations is a free, standard and open-source decentralized and federated instant messaging application for chatting with contacts or within groups.\n\nJabber ID : Your full Disroot email address\nPassword : Your Disroot password</string>
- <string name="CalcInfo">With EtherCalc work together on inventories, survey forms, list management, brainstorming sessions and more!</string>
+ <string name="ChatInfo">Conversations is a free, standard and open-source decentralized and federated instant messaging application for chatting with contacts or within groups.\n\nJabber ID :\n Your full Disroot email address\n\nPassword :\n Your Disroot password</string>
+ <string name="CalcInfo">With EtherCalc work together on inventories, survey forms, list management, brainstorming sessions and more!\nNo registration is required.</string>
<string name="CalcTitle">EtherCalc Info</string>
- <string name="BinTitle">PrivateBin Info</string>
+ <string name="BinTitle">PrivateBin Help</string>
<string name="BinInfo">PrivateBin is an open-source online pastebin and discussion board. Data is encrypted/decrypted in the browser so that the server has zero knowledge of hosted data. Just paste a text, click “Sendâ€, set expiration (and other features) and share the URL.\nNo registration is required.</string>
<string name="UploadTitle">Upload (powered by Lufi) Info</string>
- <string name="UploadInfo">Upload is a file hosting software that temporarily stores encrypted files so you can share them with others using a link.</string>
+ <string name="UploadInfo">Upload is a file hosting software that temporarily stores encrypted files so you can share them with others using a link. All files are encrypted before they leave your computer meaning server has zero knowledge of hosted data.\nNo registration is required.</string>
<string name="SearxTitle">Searx Info</string>
- <string name="SearxInfo"> Searx is an anonymous multi search engine platform, aggregating the results of other search engines while not storing information about its users.\nNo registration is required.</string>
+ <string name="SearxInfo"> Searx is an anonymous multi search engine platform, aggregating the results of other search engines while not storing information about its users. No tracking, profiling, no data mining by big corporations. \nNo registration is required.</string>
<string name="PollsTitle">Polls Help</string>
<string name="PollsInfo">Framadate is an online service for planning an appointment or making a decision quickly and easily.\nNo registration is required.</string>
<string name="BoardTitle">Project Management Board Info</string>
<string name="BoardInfo">Taiga is a project management tool, developed for programmers, designers and startups working with agile methodology in mind. It can however be applied to virtually any project or group, even outside of IT realm.</string>
- <string name="UserTitle">User Password Management Info</string>
+ <string name="UserTitle">User Password Management Help</string>
<string name="UserInfo">Use our User Self Service Center to manage your user and password data</string>
<string name="StateTitle">State Info</string>
- <string name="StateInfo">Here you can see if any service has a problem, if there are any performance issues, as well as get to know when we shcedule maintenance in which time some services might be unavailable</string>
+ <string name="StateInfo">Page to see the current stare of Disroot services. Here you can see if any service has a problem, if there are any performance issues, as well as get to know when we schedule maintenance in which time some services might be unavailable.\n\n<b>Alternative ways to get State updates:</b></string>
<string name="state_help">State on XMPP</string>
<string name="HowToTitle">How to Info</string>
<string name="HowToInfo">Our page with howtos and tutorials to help you find your way around the various Disroot services.</string>
@@ -112,7 +112,7 @@
<string name="ForumTitle">Forum Help</string>
<string name="ForumInfo">Discourse is a fully open-source modern approach to discussion forums. It offers everything your community, group or collective needs to create their communication platform.</string>
<string name="LogoTitle">Did you really just try the long press on the logo?</string>
- <string name="LogoInfo">Why? It\'s just a logo.\nDon\'t be too courious ;-)</string>
+ <string name="LogoInfo">Why? It\'s just a logo.\nDon\'t be too curious ;-)</string>
<string name="LogoBtn">Disroot rules \\o/</string>
<string name="logo">Logo</string>
<string name="xmppBtn"> \ \ • State on xmpp</string>
@@ -120,4 +120,12 @@
<string name="SocialBtn"> \ \ • State on hubzilla/diaspora/mastodon</string>
<string name="NewsBtn"> \ \ • State updates via email</string>
<string name="RssBtn"> \ \ • State RSS feed</string>
+ <string name="ChooseChatTitle">You have two XMPP clients installed!</string>
+ <string name="ChooseChat">Please choose the client you want to use for Disroot</string>
+ <string name="Remember">Remember my choise</string>
+ <string name="Conversations">Conversations</string>
+ <string name="PixArt">Pix-Art Messenger</string>
+ <string name="Forget">Forget my choise</string>
+ <string name="ForgetTitle">Forget chat client!</string>
+
</resources>
diff --git a/app/src/main/res/xml/changelog_master.xml b/app/src/main/res/xml/changelog_master.xml
index b2487e1b5c19768b2338f23cb5dd0dfff34c36a4..d0f4b0e1d8a5550efc9b352712a251ca686305f2 100644
--- a/app/src/main/res/xml/changelog_master.xml
+++ b/app/src/main/res/xml/changelog_master.xml
@@ -1,7 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<changelog>
+ <release version="0.0.5" versioncode="5" >
+ <change>User choice of chat client whit remember option</change>
+ <change>All content of dialog box is added, ready for review</change>
+ </release>
<release version="0.0.4" versioncode="4" >
- <change>Fixed Download issue when tryng to download a file for the first time</change>
+ <change>Fixed Download issue when trying to download a file for the first time</change>
<change>Changed layout of the about activity</change>
<change>Floating mail icon makes you send mail to Disroot</change>
<change>Corrected some typos</change>
@@ -15,8 +19,8 @@
<change>Download is possible</change>
<change>You can upload files from archive and from camera</change>
<change>Added about page</change>
- <change>Added link to fdroid</change>
- <change>First time tapping on icons shows ontime info</change>
+ <change>Added link to F-Droid</change>
+ <change>First time tapping on icons shows onetime info</change>
<change>Every icon shows info on long press</change>
<change>added ckChangelog</change>
</release>
@@ -30,7 +34,7 @@
<change>Fixed Blank loading of Taiga board</change>
<change>Added link to how to</change>
<change>Added exit button</change>
- <change>Tapping on a disroot domain from external app (such as browser or chat app) opens Disroot app</change>
+ <change>Tapping on a Disroot domain from external app (such as browser or chat app) opens Disroot app</change>
<change>Added reload button</change>
<change>Welcome activity added</change>
</release>