Merge pull request #305 from jmpascal/master

QA Fix

alfresco-mobile-android/src/main/java/org/alfresco/mobile/android/application/fragments/node/details/NodeDetailsFragment.java

@@ -777,7 +777,7 @@ public void onClick(DialogInterface dialog, int item)
                     b.putInt(DownloadDialogFragment.ARGUMENT_ACTION, DownloadDialogFragment.ACTION_EMAIL);
                     DialogFragment frag = new DownloadDialogFragment();
                     frag.setArguments(b);
-                    frag.show(getFragmentManager(), DownloadDialogFragment.TAG);
+                    frag.show(getActivity().getFragmentManager(), DownloadDialogFragment.TAG);
                 }
             });
             builder.setNegativeButton(R.string.link_to_repo, new DialogInterface.OnClickListener()

alfresco-mobile-android/src/main/java/org/alfresco/mobile/android/application/fragments/node/rendition/PreviewFragment.java

@@ -217,7 +217,7 @@ public void onActivityNotFoundException(ActivityNotFoundException e)
             b.putInt(DownloadDialogFragment.ARGUMENT_ACTION, DownloadDialogFragment.ACTION_OPEN);
             DialogFragment frag = new DownloadDialogFragment();
             frag.setArguments(b);
-            frag.show(getFragmentManager(), DownloadDialogFragment.TAG);
+            frag.show(getActivity().getFragmentManager(), DownloadDialogFragment.TAG);
         }
     }
 

alfresco-mobile-android/src/main/res/values-fr/strings.xml

@@ -154,7 +154,7 @@
     <string name="menu_search">Rechercher</string>
     <string name="menu_downloads">Téléchargements</string>
     <string name="menu_local_files">Fichiers locaux</string>
-    <string name="menu_about">À Propos</string>
+    <string name="menu_about">A propos</string>
     <string name="menu_settings">Paramètres</string>
     <string name="menu_accounts">Comptes</string>
     <string name="menu_view">Vues</string>
@@ -264,7 +264,7 @@
     <string name="data_protection">Protection des données</string>
     <string name="data_protection_blurb"><![CDATA[<p><b>Protection des données disponible.</b><br/> Voulez-vous l\'activer ? <p>  Cette opération va chiffrer tous les contenus Alfresco téléchargés pour chaque compte. Ces contenus ne pourront plus être lus par aucune application, sauf l\'application Alfresco. ]]></string>
     <string name="decryption_failed">Échec du déchiffrement</string>
-    <string name="protect_question"><![CDATA[<p><b>Souhaitez-vous protéger touts les contenus Alfresco téléchargés maintenant ?</b><p>  Cette opération s\'appliquera à tous les contenus que vous avez téléchargés à partir de vos comptes Alfresco. Ces contenus ne pourront plus être lus par aucune application, sauf l\'application Alfresco.]]></string>
+    <string name="protect_question"><![CDATA[<p><b>Souhaitez-vous protéger tous les contenus Alfresco téléchargés maintenant ?</b><p>  Cette opération s\'appliquera à tous les contenus que vous avez téléchargés à partir de vos comptes Alfresco. Ces contenus ne pourront plus être lus par aucune application, sauf l\'application Alfresco.]]></string>
     <string name="unprotect_question"><![CDATA[<p><b>Souhaitez-vous désactiver la protection sur tous les contenus Alfresco téléchargés maintenant ?</b><p>  Ce sera appliqué à tous les contenus téléchargés à partir de tous vos comptes Alfresco.]]></string>
     <string name="decryption_title">Désactivation de la protection des données en cours&#8230;</string>
     <string name="encryption_title">Activation de la protection des données en cours&#8230;</string>

alfresco-mobile-android/src/main/res/values-it/strings.xml

@@ -28,8 +28,8 @@
     <!-- AlfrescoAccount WIZARD SCRE STEP 1 -->
     <string name="account_wizard_alfresco_server">Server Alfresco</string>
     <string name="account_wizard_alfresco_server_description">Connetti a un server Alfresco</string>
-    <string name="account_wizard_alfresco_cloud">Cloud Alfresco</string>
-    <string name="account_wizard_alfresco_cloud_description">Accedi all\'account personale del Cloud Alfresco</string>
+    <string name="account_wizard_alfresco_cloud">Alfresco Cloud</string>
+    <string name="account_wizard_alfresco_cloud_description">Accedi all\'account personale Alfresco Cloud</string>
 
     <!-- AlfrescoAccount WIZARD SCREEN STEP 2 -->
     <string name="account">Account</string>
@@ -72,7 +72,7 @@
 
     <!-- ACCOUNTS -->
     <string name="account_not_activated">Account Alfresco non attivato. Controllare la schermata Gestione account.</string>
-    <string name="account_default_cloud">Cloud Alfresco</string>
+    <string name="account_default_cloud">Alfresco Cloud</string>
     <string name="account_default_onpremise">Server Alfresco</string>
     <string name="account_edit_hint">Modifica informazioni account Alfresco "%s"</string>
     <string name="account_delete_hint">Elimina account "%s"</string>
@@ -109,7 +109,7 @@
         Verificare le impostazioni dell\'account Alfresco e riprovare.<br/> Se il problema persiste, contattare l\'amministratore.]]>
     </string>
     <string name="error_session_cloud_unavailable">
-<![CDATA[<p><b>Il carico di lavoro del Cloud Alfresco è al momento eccessivo.</b><br/></p>
+<![CDATA[<p><b>Il carico di lavoro di Alfresco nel cloud è al momento eccessivo.</b><br/></p>
         Riprovare tra qualche minuto.<br/>]]>
     </string>
     <string name="error_session_expired">La sessione è scaduta. Ripetere l\'accesso.</string>
@@ -475,7 +475,7 @@
     <string name="action_view_properties">Visualizza proprietà</string>
     <string name="action_edit_properties">Modifica proprietà</string>
     <string name="like_in_progress">"Mi piace" in corso</string>
-    <string name="like_completed">"Mi piace" completo</string>
+    <string name="like_completed">"Mi piace" completato</string>
     <string name="like_complete">"Mi piace" completo</string>
     <string name="favorite">Preferito</string>
     <string name="unfavorite">Rimuovi dai preferiti</string>
@@ -745,7 +745,7 @@
     <!-- Storage Access Framework -->
     <string name="menu_browse_favorites_folder">Cartella dei preferiti</string>
     <string name="account_alfresco">Alfresco</string>
-    <string name="account_alfresco_cloud">Cloud Alfresco</string>
+    <string name="account_alfresco_cloud">Alfresco Cloud</string>
     <string name="account_alfresco_onpremise">Alfresco in locale</string>
 
 

alfresco-mobile-android/src/main/res/values-ja/strings.xml

@@ -616,7 +616,7 @@
 
     <!-- Tasks -->
     <string name="task_filter_view">タスクの表示</string>
-    <string name="validate">検証</string>
+    <string name="validate">有効</string>
     <string name="workflow_priority_low">優先度: 低</string>
     <string name="workflow_priority_medium">優先度: 中</string>
     <string name="workflow_priority_high">優先度: 高</string>
@@ -715,7 +715,7 @@
     <string name="display_gallery">ギャラリーの表示</string>
 
     <!-- Metadata RESTRICTABLE -->
-    <string name="metadata_aspect_restrictable">限定可能</string>
+    <string name="metadata_aspect_restrictable">制限可能</string>
     <string name="metadata_prop_offline_expires_after">オフラインでの残り使用時間</string>
 
     <!-- Advanced Search -->

platform/foundation/src/main/java/org/alfresco/mobile/android/platform/AlfrescoNotificationManager.java

@@ -256,7 +256,7 @@ public int createNotification(int notificationId, Bundle params)
             builder.setContentText(params.getString(ARGUMENT_DESCRIPTION));
         }
         builder.setNumber(0);
-        builder.setSmallIcon(R.drawable.ic_empty);
+        builder.setSmallIcon(R.drawable.ic_notification_icon);
 
         if (params.containsKey(ARGUMENT_DESCRIPTION))
         {

platform/foundation/src/main/java/org/alfresco/mobile/android/ui/node/comment/CommentsNodeAdapter.java

@@ -71,14 +71,15 @@ protected void updateBottomText(CommentViewHolder vh, Comment item)
     {
         if (vh.content != null)
         {
+            String value = (item.getContent() == null || item.getContent().isEmpty()) ? "" : item.getContent().trim();
             if (AccessibilityUtils.isEnabled(getContext()))
             {
                 vh.content.setTextIsSelectable(false);
                 AccessibilityUtils.addContentDescription(vh.content,
-                        Html.fromHtml(item.getContent().trim(), null, tagHandler).toString());
+ Html.fromHtml(value, null, tagHandler).toString());
             }
             vh.content
-                    .setText(Html.fromHtml(item.getContent().trim(), null, tagHandler), TextView.BufferType.SPANNABLE);
+.setText(Html.fromHtml(value, null, tagHandler), TextView.BufferType.SPANNABLE);
         }
     }
 

platform/foundation/src/main/res/values-it/alfresco_strings.xml

@@ -258,7 +258,7 @@
         Verificare le impostazioni dell\'account e riprovare.<br/> Se il problema persiste, contattare l\'amministratore.]]>
     </string>
     <string name="error_session_cloud_unavailable">
-<![CDATA[<p><b>Il carico di lavoro del Cloud Alfresco è al momento eccessivo.</b><br/></p>
+<![CDATA[<p><b>Il carico di lavoro di Alfresco nel cloud è al momento eccessivo.</b><br/></p>
         Riprovare tra qualche minuto.<br/>]]>
     </string>
     <string name="error_session_expired">La sessione è scaduta. Ripetere l\'accesso.</string>
@@ -282,7 +282,7 @@
     <string name="account_verify">Verifica delle informazioni account in corso...</string>
     <string name="account_wizard_alldone_description">Account pronto per l\'utilizzo.</string>
     <string name="account_default_onpremise">Server Alfresco</string>
-    <string name="account_default_cloud">Cloud Alfresco</string>
+    <string name="account_default_cloud">Alfresco Cloud</string>
 
     <!-- WAITING SESSION -->
     <string name="wait_title">Attendere</string>
@@ -306,7 +306,7 @@
 
     <!-- Quick Action Folder -->
     <string name="like_in_progress">"Mi piace" in corso</string>
-    <string name="like_completed">"Mi piace" completo</string>
+    <string name="like_completed">"Mi piace" completato</string>
     <string name="like_complete">"Mi piace" completo</string>
 
     <!-- MEMBERS -->
@@ -324,7 +324,7 @@
     <string name="more_options_favorite">Altre opzioni per %s</string>
     <string name="mime_site">Sito</string>
     <string name="more_options_site">Altre opzioni per il sito %s</string>
-    <string name="navigation_drawer_description">Alfresco: pannello apri Homepage</string>
+    <string name="navigation_drawer_description">Alfresco: apri Homepage</string>
     <string name="metadata_modified">Modificato </string>
     <string name="metadata_created_by">Creato da %s</string>
     <string name="metadata_size">Dimensioni </string>

platform/foundation/src/main/res/values-ja/alfresco_strings.xml

@@ -70,7 +70,7 @@
     <string name="org_alfresco_documentlibrary_folder_deleted">{0} が {1} によって削除されました</string>
     <string name="org_alfresco_documentlibrary_folders_deleted">{0} 個のフォルダが {1} によって削除されました</string>
     <string name="org_alfresco_documentlibrary_google_docs_checkout">{0} ファイルが {1} によってGoogle ドキュメント™ にチェックアウトされました</string>
-    <string name="org_alfresco_documentlibrary_google_docs_checkin">{0} ファイルが {1} によって Google Docs からチェックインされました</string>
+    <string name="org_alfresco_documentlibrary_google_docs_checkin">{0} ファイルが {1} によって Google ドキュメント™ からチェックインされました</string>
     <string name="org_alfresco_documentlibrary_inline_edit">{0} ファイルが {1} によって編集されました</string>
     <string name="org_alfresco_documentlibrary_file_liked">{1} がファイル {0} に [いいね !] を付けました</string>
     <string name="org_alfresco_documentlibrary_folder_liked">{1} がフォルダ {0} に [いいね!] を付けました</string>
@@ -162,7 +162,7 @@
     <string name="metadata_prop_version_comment">コメント</string>
     <string name="metadata_prop_version_current">現在のバージョン</string>
     <!-- Metadata RESTRICTABLE -->
-    <string name="metadata_aspect_restrictable">限定可能</string>
+    <string name="metadata_aspect_restrictable">制限可能</string>
     <string name="metadata_prop_offline_expires_after">オフラインでの残り使用時間</string>
     <!-- Upload/Create Content -->
     <string name="content_app_pick_file">ファイルを見つけるアプリケーションを選択してください</string>
@@ -273,7 +273,7 @@
     <string name="share_url">リンクの共有</string>
     <string name="share_content">コンテンツの共有</string>
     <string name="share_url_long">Alfresco Android Mobile からリンクを共有</string>
-    <string name="validate">検証</string>
+    <string name="validate">有効</string>
 
     <!-- SSL -->
     <string name="security_ssl_disable">SSL 証明書の検証が無効になっています。</string>