From aa6ff035450684274d976d01954457b653e93f95 Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Sat, 5 Sep 2020 14:22:42 +0200 Subject: [PATCH] drop "shop" drawer item --- .../keychain/ui/MainActivity.java | 13 ---- .../keychain/ui/SecurityKeyShopFragment.java | 77 ------------------- .../res/layout/security_key_shop_fragment.xml | 37 --------- .../src/main/res/values-ca/strings.xml | 3 +- .../src/main/res/values-cs/strings.xml | 5 +- .../src/main/res/values-de/strings.xml | 5 +- .../src/main/res/values-fr/strings.xml | 5 +- .../src/main/res/values-hu/strings.xml | 2 - .../src/main/res/values-ja/strings.xml | 5 +- .../src/main/res/values-nl/strings.xml | 5 +- .../src/main/res/values-ru/strings.xml | 5 +- .../src/main/res/values-sv/strings.xml | 3 +- .../src/main/res/values-zh/strings.xml | 5 +- OpenKeychain/src/main/res/values/strings.xml | 3 - 14 files changed, 9 insertions(+), 164 deletions(-) delete mode 100644 OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SecurityKeyShopFragment.java delete mode 100644 OpenKeychain/src/main/res/layout/security_key_shop_fragment.xml diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java index e384897e0..35dfd4670 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java @@ -55,7 +55,6 @@ public class MainActivity extends BaseSecurityTokenActivity implements FabContai public static final int ID_TRANSFER = 5; static final int ID_SETTINGS = 6; static final int ID_HELP = 7; - static final int ID_SHOP = 8; // both of these are used for instrumentation testing only public static final String EXTRA_SKIP_FIRST_TIME = "skip_first_time"; @@ -78,8 +77,6 @@ public class MainActivity extends BaseSecurityTokenActivity implements FabContai .withHeader(R.layout.main_drawer_header) .withToolbar(mToolbar) .addDrawerItems( - new PrimaryDrawerItem().withName(R.string.nav_shop).withIcon(CommunityMaterial.Icon.cmd_shopping) - .withIdentifier(ID_SHOP).withSelectable(false).withTypeface(Typeface.DEFAULT_BOLD), new PrimaryDrawerItem().withName(R.string.nav_keys).withIcon(CommunityMaterial.Icon.cmd_key) .withIdentifier(ID_KEYS).withSelectable(false), new PrimaryDrawerItem().withName(R.string.nav_encrypt_decrypt).withIcon(FontAwesome.Icon.faw_lock) @@ -125,9 +122,6 @@ public class MainActivity extends BaseSecurityTokenActivity implements FabContai case ID_HELP: intent = new Intent(MainActivity.this, HelpActivity.class); break; - case ID_SHOP: - onShopSelected(); - break; } if (intent != null) { MainActivity.this.startActivity(intent); @@ -252,13 +246,6 @@ public class MainActivity extends BaseSecurityTokenActivity implements FabContai } } - private void onShopSelected() { - mToolbar.setTitle(R.string.shop_title); - mDrawer.setSelection(ID_SHOP, false); - Fragment frag = new SecurityKeyShopFragment(); - setFragment(frag); - } - @Override protected void onSaveInstanceState(Bundle outState) { // add the values which need to be saved from the drawer to the bundle diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SecurityKeyShopFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SecurityKeyShopFragment.java deleted file mode 100644 index 7c09d8d82..000000000 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SecurityKeyShopFragment.java +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Copyright (C) 2017 Schürmann & Breitmoser GbR - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package org.sufficientlysecure.keychain.ui; - - -import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.fragment.app.Fragment; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.webkit.WebView; -import android.webkit.WebViewClient; -import android.widget.ProgressBar; -import android.widget.TextView; - -import org.sufficientlysecure.keychain.R; - -import java.util.HashMap; -import java.util.Map; - -public class SecurityKeyShopFragment extends Fragment { - - public static final String webShopURL = "https://shop.cotech.de/"; - public static final String referer = "https://openkeychain.shop.cotech.de"; - - public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { - View view = inflater.inflate(R.layout.security_key_shop_fragment, container, false); - - WebView webView = view.findViewById(R.id.shop_webView); - webView.setWebViewClient(new SecurityKeyShopWebViewClient( - view.findViewById(R.id.shop_progressbar), - view.findViewById(R.id.shop_progressbar_label) - )); - webView.getSettings().setJavaScriptEnabled(true); - Map headers = new HashMap<>(); - headers.put("Referer", referer); - webView.loadUrl(webShopURL, headers); - return view; - } - - class SecurityKeyShopWebViewClient extends WebViewClient { - private ProgressBar progressBar; - private TextView progressBarLabel; - - SecurityKeyShopWebViewClient(ProgressBar progressBar, TextView progressBarLabel) { - this.progressBar = progressBar; - this.progressBarLabel = progressBarLabel; - progressBar.setVisibility(View.VISIBLE); - progressBarLabel.setVisibility(View.VISIBLE); - } - - @Override - public void onPageCommitVisible(WebView view, String url) { - super.onPageCommitVisible(view, url); - progressBar.setVisibility(View.GONE); - progressBarLabel.setVisibility(View.GONE); - } - } - -} diff --git a/OpenKeychain/src/main/res/layout/security_key_shop_fragment.xml b/OpenKeychain/src/main/res/layout/security_key_shop_fragment.xml deleted file mode 100644 index b02d422ec..000000000 --- a/OpenKeychain/src/main/res/layout/security_key_shop_fragment.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/OpenKeychain/src/main/res/values-ca/strings.xml b/OpenKeychain/src/main/res/values-ca/strings.xml index 941a9d845..bc3fa8336 100644 --- a/OpenKeychain/src/main/res/values-ca/strings.xml +++ b/OpenKeychain/src/main/res/values-ca/strings.xml @@ -698,8 +698,7 @@ Les meves claus Còpia de seguretat/Restaura Transferència Wifi segura - Botiga - + Escriviu text per defecte diff --git a/OpenKeychain/src/main/res/values-cs/strings.xml b/OpenKeychain/src/main/res/values-cs/strings.xml index d6ecf4f37..65edf4848 100644 --- a/OpenKeychain/src/main/res/values-cs/strings.xml +++ b/OpenKeychain/src/main/res/values-cs/strings.xml @@ -814,8 +814,7 @@ Moje Klíče Záloha/Obnova Bezpečný přenos přes WiFi - Obchod - + Napsat text výchozí @@ -1878,6 +1877,4 @@ Doba platnosti se změni do %s Sdílet klíč skrze schránku Sdílet klíč - Otevírám obchod... - COTECH Security Keys diff --git a/OpenKeychain/src/main/res/values-de/strings.xml b/OpenKeychain/src/main/res/values-de/strings.xml index b45742283..4630b660a 100644 --- a/OpenKeychain/src/main/res/values-de/strings.xml +++ b/OpenKeychain/src/main/res/values-de/strings.xml @@ -778,8 +778,7 @@ Meine Schlüssel Backup/Wiederherstellung Sichere WiFi Übertragung - Shop - + Text eingeben normal @@ -1811,6 +1810,4 @@ Ein sicherer Schlüssel sollte eine Stärke von 2048 Bits besitzen. Ablauf wird geändert zu \"%s\" Schlüssel per Zwischenablage teilen Schlüssel teilen - Shop wird geladen... - COTECH Sicherheitsschlüssel diff --git a/OpenKeychain/src/main/res/values-fr/strings.xml b/OpenKeychain/src/main/res/values-fr/strings.xml index 7f7839373..3a023e616 100644 --- a/OpenKeychain/src/main/res/values-fr/strings.xml +++ b/OpenKeychain/src/main/res/values-fr/strings.xml @@ -778,8 +778,7 @@ Mes clés Sauvegarder/Restaurer Transfert Wi-Fi sécurisé - Boutique - + Saisir le texte valeur par défaut @@ -1810,6 +1809,4 @@ La date d’expiration sera changé à %s Partager la clé avec le presse-papiers Partager la clé - Chargement de la boutique… - Clés de sécurité COTECH diff --git a/OpenKeychain/src/main/res/values-hu/strings.xml b/OpenKeychain/src/main/res/values-hu/strings.xml index 23cdfd3bf..515c3268e 100644 --- a/OpenKeychain/src/main/res/values-hu/strings.xml +++ b/OpenKeychain/src/main/res/values-hu/strings.xml @@ -747,6 +747,4 @@ A lejárat %s értékre változik Kulcs megosztása vágólappal Kulcs megosztása - Shop betöltése... - COTECH biztonsági kulcsok diff --git a/OpenKeychain/src/main/res/values-ja/strings.xml b/OpenKeychain/src/main/res/values-ja/strings.xml index 8d5590187..efe656435 100644 --- a/OpenKeychain/src/main/res/values-ja/strings.xml +++ b/OpenKeychain/src/main/res/values-ja/strings.xml @@ -764,8 +764,7 @@ 自分の鍵 バックアップ/リストア 安全な Wifi 転送 - ショップ - + テキストを入力 デフォルト @@ -1780,6 +1779,4 @@ 有効期限は%sに変更されます クリップボードでキーを共有する 鍵の共有 - ショップを読み込んでいます… - COTECH セキュリティ鍵 diff --git a/OpenKeychain/src/main/res/values-nl/strings.xml b/OpenKeychain/src/main/res/values-nl/strings.xml index b37557207..4770a05d1 100644 --- a/OpenKeychain/src/main/res/values-nl/strings.xml +++ b/OpenKeychain/src/main/res/values-nl/strings.xml @@ -778,8 +778,7 @@ Mijn sleutels Back-up/herstellen Beveiligde wifi-overdracht - Winkel - + Voer tekst in standaard @@ -1810,6 +1809,4 @@ Verloopdatum zal wijzigen naar %s Sleutel delen via klembord Sleutel delen - Winkel aan het laden… - COTECH-beveiligingssleutels diff --git a/OpenKeychain/src/main/res/values-ru/strings.xml b/OpenKeychain/src/main/res/values-ru/strings.xml index 39f2ca095..6b657c690 100644 --- a/OpenKeychain/src/main/res/values-ru/strings.xml +++ b/OpenKeychain/src/main/res/values-ru/strings.xml @@ -815,8 +815,7 @@ Мои ключи Резервирование/Восстановление Безопасная передача по Wi-Fi - Магазин - + Напишите текст по умолчанию @@ -1879,6 +1878,4 @@ Срок годности будет изменён на %s Отправить ключ в буфер обмена Отправить ключ - Загрузка магазина... - Ключи безопасности COTECH diff --git a/OpenKeychain/src/main/res/values-sv/strings.xml b/OpenKeychain/src/main/res/values-sv/strings.xml index aaf318b67..0908b17b5 100644 --- a/OpenKeychain/src/main/res/values-sv/strings.xml +++ b/OpenKeychain/src/main/res/values-sv/strings.xml @@ -774,8 +774,7 @@ Mina nycklar Säkerhetskopiera/återställa Säker Wi-Fi-överföring - Butik - + Skriv text förval diff --git a/OpenKeychain/src/main/res/values-zh/strings.xml b/OpenKeychain/src/main/res/values-zh/strings.xml index 3a9bae2e0..40cb2da8f 100644 --- a/OpenKeychain/src/main/res/values-zh/strings.xml +++ b/OpenKeychain/src/main/res/values-zh/strings.xml @@ -760,8 +760,7 @@ 我的密钥 备份/恢复 安全 Wifi 传输 - 商店 - + 此处输入要加密的内容 默认 @@ -1776,6 +1775,4 @@ 过期时间将更改为%s 通过剪贴板共享 共享密钥 - 加载商店 - COTECH 安全密钥 diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index ba619089c..ce2457c16 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -817,7 +817,6 @@ "My Keys" "Backup/Restore" "Secure Wifi Transfer" - Shop "Type text" @@ -1912,6 +1911,4 @@ Share key via clipboard Share key - Loading shop… - COTECH Security Keys