PeterCxy
/
open-keychain
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

drop "try autocrypt" link from drawer

master
Vincent Breitmoser 2020-09-05 14:19:10 +02:00
parent 7154159a36
commit 197afe37cc
11 changed files with 10 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java
View File

@ -20,7 +20,6 @@ package org.sufficientlysecure.keychain.ui;
import android.content.Intent;
import android.graphics.Typeface;
import android.net.Uri;
import android.os.Build;
import android.os.Build.VERSION_CODES;
import android.os.Bundle;
@ -57,7 +56,6 @@ public class MainActivity extends BaseSecurityTokenActivity implements FabContai
static final int ID_SETTINGS = 6;
static final int ID_HELP = 7;
static final int ID_SHOP = 8;
static final int ID_AUTOCRYPT = 9;
// both of these are used for instrumentation testing only
public static final String EXTRA_SKIP_FIRST_TIME = "skip_first_time";
@ -97,10 +95,7 @@ public class MainActivity extends BaseSecurityTokenActivity implements FabContai
.withIdentifier(ID_TRANSFER).withSelectable(false),
new DividerDrawerItem(),
new PrimaryDrawerItem().withName(R.string.menu_preferences).withIcon(GoogleMaterial.Icon.gmd_settings).withIdentifier(ID_SETTINGS).withSelectable(false),
new PrimaryDrawerItem().withName(R.string.menu_help).withIcon(CommunityMaterial.Icon.cmd_help_circle).withIdentifier(ID_HELP).withSelectable(false),
new DividerDrawerItem(),
new PrimaryDrawerItem().withName(R.string.nav_autocrypt).withIcon(GoogleMaterial.Icon.gmd_blur_on)
.withTypeface(Typeface.DEFAULT_BOLD).withSelectable(false).withIdentifier(ID_AUTOCRYPT)
new PrimaryDrawerItem().withName(R.string.menu_help).withIcon(CommunityMaterial.Icon.cmd_help_circle).withIdentifier(ID_HELP).withSelectable(false)
)
.withOnDrawerItemClickListener(new Drawer.OnDrawerItemClickListener() {
@Override
@ -133,9 +128,6 @@ public class MainActivity extends BaseSecurityTokenActivity implements FabContai
case ID_SHOP:
onShopSelected();
break;
case ID_AUTOCRYPT:
onAutocryptSelected();
break;
}
if (intent != null) {
MainActivity.this.startActivity(intent);
@ -267,13 +259,6 @@ public class MainActivity extends BaseSecurityTokenActivity implements FabContai
setFragment(frag);
}
private void onAutocryptSelected() {
String url = "https://addons.thunderbird.net/en-US/thunderbird/addon/autocrypt/";
Intent intent = new Intent(Intent.ACTION_VIEW);
intent.setData(Uri.parse(url));
startActivity(intent);
}
@Override
protected void onSaveInstanceState(Bundle outState) {
// add the values which need to be saved from the drawer to the bundle

3
OpenKeychain/src/main/res/values-ca/strings.xml
View File

@ -699,8 +699,7 @@
<string name="nav_backup">Còpia de seguretat/Restaura</string>
<string name="nav_transfer">Transferència Wifi segura</string>
<string name="nav_shop">Botiga</string>
<string name="nav_autocrypt">Proveu Autocrypt amb Thunderbird</string>
<!--hints-->
<!--hints-->
<string name="encrypt_content_edit_text_hint">Escriviu text</string>
<!--certs-->
<string name="cert_default">per defecte</string>

3
OpenKeychain/src/main/res/values-cs/strings.xml
View File

@ -815,8 +815,7 @@
<string name="nav_backup">Záloha/Obnova</string>
<string name="nav_transfer">Bezpečný přenos přes WiFi</string>
<string name="nav_shop">Obchod</string>
<string name="nav_autocrypt">Vyzkoušejte Autocrypt s Thunderbird</string>
<!--hints-->
<!--hints-->
<string name="encrypt_content_edit_text_hint">Napsat text</string>
<!--certs-->
<string name="cert_default">výchozí</string>

3
OpenKeychain/src/main/res/values-de/strings.xml
View File

@ -779,8 +779,7 @@
<string name="nav_backup">Backup/Wiederherstellung</string>
<string name="nav_transfer">Sichere WiFi Übertragung</string>
<string name="nav_shop">Shop</string>
<string name="nav_autocrypt">Autocrypt mit Thunderbird probieren</string>
<!--hints-->
<!--hints-->
<string name="encrypt_content_edit_text_hint">Text eingeben</string>
<!--certs-->
<string name="cert_default">normal</string>

3
OpenKeychain/src/main/res/values-fr/strings.xml
View File

@ -779,8 +779,7 @@
<string name="nav_backup">Sauvegarder/Restaurer</string>
<string name="nav_transfer">Transfert Wi-Fi sécurisé</string>
<string name="nav_shop">Boutique</string>
<string name="nav_autocrypt">Essayer Autocrypt avec Thunderbird</string>
<!--hints-->
<!--hints-->
<string name="encrypt_content_edit_text_hint">Saisir le texte</string>
<!--certs-->
<string name="cert_default">valeur par défaut</string>

3
OpenKeychain/src/main/res/values-ja/strings.xml
View File

@ -765,8 +765,7 @@
<string name="nav_backup">バックアップ/リストア</string>
<string name="nav_transfer">安全な Wifi 転送</string>
<string name="nav_shop">ショップ</string>
<string name="nav_autocrypt">Thunderbird と Autocrypt をお試しください</string>
<!--hints-->
<!--hints-->
<string name="encrypt_content_edit_text_hint">テキストを入力</string>
<!--certs-->
<string name="cert_default">デフォルト</string>

3
OpenKeychain/src/main/res/values-nl/strings.xml
View File

@ -779,8 +779,7 @@
<string name="nav_backup">Back-up/herstellen</string>
<string name="nav_transfer">Beveiligde wifi-overdracht</string>
<string name="nav_shop">Winkel</string>
<string name="nav_autocrypt">Probeer Autocrypt met Thunderbird</string>
<!--hints-->
<!--hints-->
<string name="encrypt_content_edit_text_hint">Voer tekst in</string>
<!--certs-->
<string name="cert_default">standaard</string>

3
OpenKeychain/src/main/res/values-ru/strings.xml
View File

@ -816,8 +816,7 @@
<string name="nav_backup">Резервирование/Восстановление</string>
<string name="nav_transfer">Безопасная передача по Wi-Fi</string>
<string name="nav_shop">Магазин</string>
<string name="nav_autocrypt">Попробуйте Autocrypt с Thunderbird</string>
<!--hints-->
<!--hints-->
<string name="encrypt_content_edit_text_hint">Напишите текст</string>
<!--certs-->
<string name="cert_default">по умолчанию</string>

3
OpenKeychain/src/main/res/values-sv/strings.xml
View File

@ -775,8 +775,7 @@
<string name="nav_backup">Säkerhetskopiera/återställa</string>
<string name="nav_transfer">Säker Wi-Fi-överföring</string>
<string name="nav_shop">Butik</string>
<string name="nav_autocrypt">Prova Autocrypt med Thunderbird</string>
<!--hints-->
<!--hints-->
<string name="encrypt_content_edit_text_hint">Skriv text</string>
<!--certs-->
<string name="cert_default">förval</string>

3
OpenKeychain/src/main/res/values-zh/strings.xml
View File

@ -761,8 +761,7 @@
<string name="nav_backup">备份/恢复</string>
<string name="nav_transfer">安全 Wifi 传输</string>
<string name="nav_shop">商店</string>
<string name="nav_autocrypt">尝试在 Thunderbird 中自动加密</string>
<!--hints-->
<!--hints-->
<string name="encrypt_content_edit_text_hint">此处输入要加密的内容</string>
<!--certs-->
<string name="cert_default">默认</string>

1
OpenKeychain/src/main/res/values/strings.xml
View File

@ -818,7 +818,6 @@
<string name="nav_backup">"Backup/Restore"</string>
<string name="nav_transfer">"Secure Wifi Transfer"</string>
<string name="nav_shop">Shop</string>
<string name="nav_autocrypt">Try Autocrypt with Thunderbird</string>
<!-- hints -->
<string name="encrypt_content_edit_text_hint">"Type text"</string>