Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@David-Development
David-Development committed Jun 21, 2015
2 parents 0bf3f8b + 4fd7965 commit bd3c94f
Show file tree
Hide file tree
Showing 6 changed files with 230 additions and 24 deletions.
31 changes: 15 additions & 16 deletions News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/ssl/MemorizingTrustManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -275,29 +275,28 @@ public void checkCertTrusted(X509Certificate[] chain, String authType, boolean i
{
Log.d(TAG, "checkCertTrusted(" + chain + ", " + authType + ", " + isServer + ")");
try {
Log.d(TAG, "checkCertTrusted: trying appTrustManager");
Log.d(TAG, "checkCertTrusted: trying defaultTrustManager");
if (isServer)
appTrustManager.checkServerTrusted(chain, authType);
defaultTrustManager.checkServerTrusted(chain, authType);
else
appTrustManager.checkClientTrusted(chain, authType);
defaultTrustManager.checkClientTrusted(chain, authType);
} catch (CertificateException ae) {
// if the cert is stored in our appTrustManager, we ignore expiredness
ae.printStackTrace();
if (isExpiredException(ae)) {
Log.i(TAG, "checkCertTrusted: accepting expired certificate from keystore");
return;
}
if (isCertKnown(chain[0])) {
Log.i(TAG, "checkCertTrusted: accepting cert already stored in keystore");
return;
}
try {
Log.d(TAG, "checkCertTrusted: trying defaultTrustManager");
Log.d(TAG, "checkCertTrusted: trying appTrustManager");
if (isServer)
defaultTrustManager.checkServerTrusted(chain, authType);
appTrustManager.checkServerTrusted(chain, authType);
else
defaultTrustManager.checkClientTrusted(chain, authType);
appTrustManager.checkClientTrusted(chain, authType);
} catch (CertificateException e) {
// if the cert is stored in our appTrustManager, we ignore expiredness
if (isExpiredException(e)) {
Log.i(TAG, "checkCertTrusted: accepting expired certificate from keystore");
return;
}
if (isCertKnown(chain[0])) {
Log.i(TAG, "checkCertTrusted: accepting cert already stored in keystore");
return;
}
e.printStackTrace();
interact(chain, authType, e);
}
Expand Down
171 changes: 163 additions & 8 deletions News-Android-App/src/main/res/values-oc/strings.xml
View file
Original file line number Diff line number Diff line change
@@ -1,39 +1,193 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources>
<string name="auto_sync_string">Sincronizacion auto.</string>
<string name="app_name">ownCloud News Reader</string>
<string name="title_activity_sync_interval_selector">Selector d\'interval de sincronizacion</string>
<string name="title_activity_news_detail">NewsDetailActivity</string>
<string name="title_activity_subscription">SubscriptionActivity</string>
<string name="title_newsreader_list">Lector de news</string>
<string name="title_newsreader_detail">Detalh del lector de news</string>
<string name="empty_view_header">Informacion</string>
<string name="empty_view_content">Pas cap d\'article</string>
<string name="toast_GettingMoreItems">Telecargament d\'articles suplementari en cors... Pacientatz.</string>
<string name="tv_clickHereToOpenItem">Legir</string>
<string name="no_wifi_available">Pas cap de connexion Wi-Fi</string>
<string name="do_you_want_to_download_without_wifi">Telecargar los imatges sens connexion Wi-Fi ?</string>
<string name="max_items_count_reached">Avètz atench lo limit maximal de XX articles</string>
<string name="widget_header">Actualitats ownCloud</string>
<string name="message_bar_new_articles_available">Novèls articles disponibles</string>
<string name="message_bar_reload">Recargar</string>
<string name="allUnreadFeeds">Totes los articles pas legits</string>
<string name="starredFeeds">Articles favorits</string>
<string name="title_activity_new_feed">Apondre un flux</string>
<!--<string name="non_sorted_articles">Nicht zugeordnete Artikel</string>-->
<string name="menu_update">Refresca</string>
<string name="menu_update">Refrescar</string>
<string name="menu_About_Changelog">A prepaus / Jornal de las modificacions</string>
<string name="menu_markAllAsRead">Marcar totes coma legits</string>
<string name="menu_StartImageCaching">Telecargar los imatges</string>
<string name="menu_downloadMoreItems">+ d\'articles</string>
<!--Import Accounts-->
<string name="import_account_dialog_title">Importar un compte</string>
<!--EMAIL-->
<string name="email_sourceCode">Còde font de l\'article - Rapòrt de bug</string>
<string name="email_sendMail">Mandar un corrièl</string>
<!--Action Bar Items-->
<string name="action_Share">Parteja</string>
<string name="action_save">Enregistra</string>
<string name="action_settings">Configuracion</string>
<string name="action_starred">Favorit</string>
<string name="action_read">Legit</string>
<string name="action_playPodacst">Legir lo Podcast</string>
<string name="action_openInBrowser">Afichar dins lo navigador</string>
<string name="action_sendSourceCode">Mandar l\'article al desvolopaire</string>
<string name="action_Share">Partejar</string>
<string name="action_login">Paramètres del servidor</string>
<string name="action_save">Salvar</string>
<string name="action_settings">Paramètres</string>
<string name="action_sync_settings">Paramètres de sincronizacion</string>
<string name="action_add_new_feed">Apondre un flux novèl</string>
<string name="action_textToSpeech">Legir a votz nauta</string>
<string name="notification_new_items_ticker">Avètz X novèls articles pas legits</string>
<string name="notification_new_items_text">X novèls articles pas legits disponibles</string>
<!--Strings related to login-->
<string name="pref_title_username">Non d\'usancièr</string>
<string name="pref_title_username">Nom d\'utilizaire</string>
<string name="pref_title_password">Senhal</string>
<!--<string name="pref_title_owncloudRootPath">ownCloud root address</string>-->
<string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
<!--<string name="pref_default_username">admin</string>-->
<string name="action_sign_in_short">S\'identificar</string>
<string name="login_progress_signing_in">Connexion en cors…</string>
<string name="error_incorrect_password">Lo senhal es incorrècte</string>
<string name="error_field_required">Aqueste camp es requesit</string>
<string name="error_invalid_url">Aquesta URL es incorrècta</string>
<!--Toast Messages-->
<string name="toast_downloaded_x_items">X ancians articles telecargats</string>
<string name="toast_no_more_downloads_available">Cap d\'article suplementari pas disponible</string>
<string name="pull_to_refresh_updateTags">Sincronizacion de l’estat dels articles</string>
<string name="pull_to_refresh_updateFolder">Sincronizacion del dorsièr</string>
<string name="pull_to_refresh_updateFeeds">Sincronizacion dels fluxes</string>
<string name="pull_to_refresh_updateItems">Sincronizacion dels articles</string>
<!--Strings related to Settings-->
<string name="title_activity_settings">Configuracion</string>
<string name="title_activity_settings">Paramètres</string>
<!--General settings-->
<string name="pref_header_general">General</string>
<string name="pref_header_general">Generals</string>
<string name="pref_title_general_sort_order">Òrdre de triada</string>
<string-array name="pref_general_sort_order">
<item>Recent -&gt; Ancian</item>
<item>Ancian -&gt; Recent</item>
</string-array>
<string-array name="pref_general_sort_order_values_not_translated">
<item>1</item>
<item>0</item>
</string-array>
<!--<string-array name="pref_general_sort_order_values">
<item>desc</item>
<item>asc</item>
</string-array>-->
<!--<string name="pref_title_social_recommendations">Enable social recommendations</string>
<string name="pref_description_social_recommendations">Recommendations for people to contact based on your message history</string>-->
<string name="dialog_clearing_cache">Voidar l\'escondedor</string>
<string name="dialog_clearing_cache_please_wait">Netejatge de l\'escondedor en cors... Pacientatz.</string>
<string name="calculating_cache_size">Calcul de la talha de l\'escondedor en cors... Pacientatz.</string>
<string name="reset_cache_unsaved_changes">Certanas modificacions son pas sincronizadas. Volètz reïnicializar l\'escondedor malgrat tot ?</string>
<string name="warning">Atencion</string>
<string name="pref_title_AutoSyncOnStart">Sincro. a l\'aviada</string>
<string name="pref_title_ShowOnlyUnread">Amagar los articles legits</string>
<!--<string name="pref_title_AllowAllSSLCertificates">Allow all SSL Certificates</string>-->
<string name="pref_title_DisableHostnameVerification">Desactivar la verificacion del nom de maquina</string>
<string name="pref_title_NavigateWithVolumeButtons">Navigar amb los botons de volum</string>
<string name="pref_title_MarkAsReadWhileScrolling">Marcar coma legit tot en desfilant</string>
<string name="pref_title_OpenInBrowserDirectly">Passar la vista detalhada e dobrir dirèctament l\'article dins lo navigador</string>
<string name="pref_title_notification_new_articles_available">Afichar una notificacion quand d\'articles novèls son disponibles</string>
<!--MemorizingTrustManager-->
<string name="mtm_accept_cert">Acceptar los certificats pas segurs ?</string>
<string name="mtm_decision_always">Totjorn</string>
<string name="mtm_decision_once">Aqueste còp</string>
<string name="mtm_decision_abort">Anullar</string>
<string name="mtm_notification">Verificacion del certificat</string>
<!--Podcast-->
<string name="pref_header_podcast">Podcast</string>
<string name="pref_enable_podcasts">Activar la presa en carga dels Podcasts</string>
<string name="no_podcast_selected">Cap de podcast pas seleccionat</string>
<!--Settings for Display-->
<string name="pref_header_display">Afichatge</string>
<string name="pref_title_app_theme">Tèma de l\'app</string>
<string name="pref_title_feed_list_layout">Disposicion de la lista dels fluxes</string>
<string-array name="pref_display_apptheme">
<item>Escur</item>
<item>Clar</item>
</string-array>
<string-array name="pref_display_apptheme_values">
<item>0</item>
<item>1</item>
</string-array>
<string-array name="pref_display_feed_list_layout">
<item>Simple</item>
<item>Espandit</item>
<item>Espandit amb WebView</item>
</string-array>
<string-array name="pref_display_feed_list_layout_values">
<item>0</item>
<item>1</item>
<item>2</item>
</string-array>
<!--Login Dialog-->
<string name="login_dialog_title_error">Error</string>
<string name="login_dialog_title_security_warning">Avertiment de securitat</string>
<string name="login_dialog_text_something_went_wrong">Un problèma s\'es produsit :-(</string>
<string name="login_dialog_text_not_compatible">La version d\'aquesta aplicacion es pas compatibla amb vòstra aplicacion News de ownCloud. Metètz a jorn l\'aplicacion News e lo framework d\'aplicacions.</string>
<string name="login_dialog_title_security_warning">Avertiment de seguretat</string>
<string name="login_dialog_text_security_warning">Utilizatz pas HTTPS. Una persona malvolenta poiriá interceptar vòstre trafic e obténer de donadas sensiblas (ex. vòstre senhal). Es bravament recomandat d\'utilizar HTTPS !</string>
<!--Data & Sync-->
<string name="pref_header_data_sync">Donadas &amp; sincronizacion</string>
<!--<string name="pref_title_data_sync_max_items">Max number of items to sync</string>-->
<string name="pref_title_clearCache">Voidar l\'escondedor</string>
<string name="pref_title_CacheImagesOffline">Mesa en escondedor fòra linha dels imatges</string>
<string name="pref_title_Max_Cache_Size">Talha maximala de l\'escondedor</string>
<string-array name="pref_data_sync_image_cache_values">
<item>0</item>
<item>1</item>
<item>2</item>
<item>3</item>
</string-array>
<string-array name="pref_data_sync_max_cache_size">
<item>250 Mo</item>
<item>500 Mo</item>
<item>750 Mo</item>
<item>1 Go</item>
<item>2 Go</item>
<item>5 Go</item>
<item>10 Go</item>
</string-array>
<string-array name="pref_data_sync_max_cache_size_values">
<item>250</item>
<item>500</item>
<item>750</item>
<item>1000</item>
<item>2000</item>
<item>5000</item>
<item>10000</item>
</string-array>
<string-array name="array_sync_interval">
<item>5 Minutas</item>
<item>15 Minutas</item>
<item>30 Minutas</item>
<item>45 Minutas</item>
<item>1 Ora</item>
<item>2 Oras</item>
<item>3 Oras</item>
<item>6 Oras</item>
<item>12 Oras</item>
<item>24 Oras</item>
</string-array>
<string-array name="array_sync_interval_values">
<item>5</item>
<item>15</item>
<item>30</item>
<item>45</item>
<item>60</item>
<item>120</item>
<item>180</item>
<item>360</item>
<item>720</item>
<item>1440</item>
</string-array>
<!--<string name="pref_title_sync_frequency">Sync frequency</string>
<string-array name="pref_sync_frequency_titles">
Expand All @@ -53,6 +207,7 @@
<item>-1</item>
</string-array>-->
<!--<string name="pref_title_system_sync_settings">System sync settings</string>-->
<string name="pref_header_notifications">Notificacions</string>
<!--<string name="pref_title_new_message_notifications">New message notifications</string>
<string name="pref_title_ringtone">Ringtone</string>
<string name="pref_ringtone_silent">Silent</string>
Expand Down
13 changes: 13 additions & 0 deletions News-Android-App/src/main/res/values-pt-rPT/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@
<string name="pref_header_display">Mostrar</string>
<string name="pref_title_app_theme">Tema da App</string>
<string name="pref_title_feed_list_layout">Disposição da lista de feeds</string>
<string name="pref_display_title_lines_count">Contagem de linhas para o titulo</string>
<string-array name="pref_display_apptheme">
<item>Escuro</item>
<item>Claro</item>
Expand All @@ -128,6 +129,18 @@
<item>1</item>
<item>2</item>
</string-array>
<string-array name="pref_title_lines_count">
<item>1</item>
<item>2</item>
<item>3</item>
<item>4</item>
</string-array>
<string-array name="pref_title_lines_count_values">
<item>1</item>
<item>2</item>
<item>3</item>
<item>4</item>
</string-array>
<!--Login Dialog-->
<string name="login_dialog_title_error">Erro</string>
<string name="login_dialog_text_something_went_wrong">Ocorreu algo de errado :(</string>
Expand Down
13 changes: 13 additions & 0 deletions News-Android-App/src/main/res/values-ru/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@
<string name="pref_header_display">Экран</string>
<string name="pref_title_app_theme">Тема приложения</string>
<string name="pref_title_feed_list_layout">Макет списка лент</string>
<string name="pref_display_title_lines_count">Количество строк для заголовка</string>
<string-array name="pref_display_apptheme">
<item>Темная</item>
<item>Светлая</item>
Expand All @@ -128,6 +129,18 @@
<item>1</item>
<item>2</item>
</string-array>
<string-array name="pref_title_lines_count">
<item>1</item>
<item>2</item>
<item>3</item>
<item>4</item>
</string-array>
<string-array name="pref_title_lines_count_values">
<item>1</item>
<item>2</item>
<item>3</item>
<item>4</item>
</string-array>
<!--Login Dialog-->
<string name="login_dialog_title_error">Ошибка</string>
<string name="login_dialog_text_something_went_wrong">Что-то пошло не так :(</string>
Expand Down
13 changes: 13 additions & 0 deletions News-Android-App/src/main/res/values-sl/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@
<string name="pref_header_display">Prikaz</string>
<string name="pref_title_app_theme">Ime teme</string>
<string name="pref_title_feed_list_layout">Postavitev seznama virov</string>
<string name="pref_display_title_lines_count">Vrstični števec za naslov</string>
<string-array name="pref_display_apptheme">
<item>Temna</item>
<item>Svetla</item>
Expand All @@ -128,6 +129,18 @@
<item>1</item>
<item>2</item>
</string-array>
<string-array name="pref_title_lines_count">
<item>1</item>
<item>2</item>
<item>3</item>
<item>4</item>
</string-array>
<string-array name="pref_title_lines_count_values">
<item>1</item>
<item>2</item>
<item>3</item>
<item>4</item>
</string-array>
<!--Login Dialog-->
<string name="login_dialog_title_error">Napaka</string>
<string name="login_dialog_text_something_went_wrong">Prišlo je do napake :(</string>
Expand Down
13 changes: 13 additions & 0 deletions News-Android-App/src/main/res/values-tr/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@
<string name="pref_header_display">Görüntüle</string>
<string name="pref_title_app_theme">Uyg. teması</string>
<string name="pref_title_feed_list_layout">Besleme listesi yerleşimi</string>
<string name="pref_display_title_lines_count">Başlık için satır sayısı</string>
<string-array name="pref_display_apptheme">
<item>Koyu</item>
<item>Açık</item>
Expand All @@ -128,6 +129,18 @@
<item>1</item>
<item>2</item>
</string-array>
<string-array name="pref_title_lines_count">
<item>1</item>
<item>2</item>
<item>3</item>
<item>4</item>
</string-array>
<string-array name="pref_title_lines_count_values">
<item>1</item>
<item>2</item>
<item>3</item>
<item>4</item>
</string-array>
<!--Login Dialog-->
<string name="login_dialog_title_error">Hata</string>
<string name="login_dialog_text_something_went_wrong">Bir şeyler yanlış gitti :(</string>
Expand Down

0 comments on commit bd3c94f

Please sign in to comment.