From b2f01ba8f5c7a33f4b84307152e41992db48c58c Mon Sep 17 00:00:00 2001
From: Govind Dixit <lit2017018@iiita.ac.in>
Date: Wed, 17 Apr 2019 15:52:17 +0530
Subject: [PATCH 1/2] feat: add license

---
 .../chat/rocket/android/settings/ui/SettingsFragment.kt  | 9 ++++++++-
 app/src/main/res/values/strings.xml                      | 1 +
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/chat/rocket/android/settings/ui/SettingsFragment.kt b/app/src/main/java/chat/rocket/android/settings/ui/SettingsFragment.kt
index 74c61d2a48..95c32e9605 100644
--- a/app/src/main/java/chat/rocket/android/settings/ui/SettingsFragment.kt
+++ b/app/src/main/java/chat/rocket/android/settings/ui/SettingsFragment.kt
@@ -166,7 +166,14 @@ class SettingsFragment : Fragment(), SettingsView, AdapterView.OnItemClickListen
                 }
             }
 
-            resources.getStringArray(R.array.widechat_settings_actions)[3] -> {
+            resources.getStringArray(R.array.widechat_settings_actions)[3] ->activity?.startActivity(
+                context?.webViewIntent(
+                    getString(R.string.license_url),
+                    getString(R.string.title_licence)
+                )
+            )
+
+            resources.getStringArray(R.array.widechat_settings_actions)[4] -> {
                     showLogoutDialog()
                 }
             }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e5a1372f48..42cf745b1f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -98,6 +98,7 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
         <item name="item_preferences">Preferences</item>
         <item name="item_privacy">Privacy</item>
         <item name="item_about">About</item>
+        <item name="item_license">License</item>
         <item name="item_logout">Log Out</item>
     </string-array>
 

From 6d705a9b83e92ef6b85edcccdf4c0ab3dd477e82 Mon Sep 17 00:00:00 2001
From: Govind Dixit <lit2017018@iiita.ac.in>
Date: Wed, 17 Apr 2019 21:54:44 +0530
Subject: [PATCH 2/2] fix: typo and url

---
 .../java/chat/rocket/android/settings/ui/SettingsFragment.kt  | 4 ++--
 app/src/main/res/values-ar/strings.xml                        | 4 ++--
 app/src/main/res/values-de/strings.xml                        | 4 ++--
 app/src/main/res/values-es/strings.xml                        | 4 ++--
 app/src/main/res/values-fa/strings.xml                        | 4 ++--
 app/src/main/res/values-fr/strings.xml                        | 4 ++--
 app/src/main/res/values-hi-rIN/strings.xml                    | 4 ++--
 app/src/main/res/values-it/strings.xml                        | 4 ++--
 app/src/main/res/values-ja/strings.xml                        | 4 ++--
 app/src/main/res/values-pt-rBR/strings.xml                    | 4 ++--
 app/src/main/res/values-pt-rPT/strings.xml                    | 4 ++--
 app/src/main/res/values-ru-rRU/strings.xml                    | 4 ++--
 app/src/main/res/values-tr/strings.xml                        | 4 ++--
 app/src/main/res/values-uk/strings.xml                        | 4 ++--
 app/src/main/res/values-zh-rCN/strings.xml                    | 4 ++--
 app/src/main/res/values-zh-rTW/strings.xml                    | 4 ++--
 app/src/main/res/values/defaults.xml                          | 2 +-
 app/src/main/res/values/strings.xml                           | 4 ++--
 18 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/app/src/main/java/chat/rocket/android/settings/ui/SettingsFragment.kt b/app/src/main/java/chat/rocket/android/settings/ui/SettingsFragment.kt
index 95c32e9605..a7004ec58f 100644
--- a/app/src/main/java/chat/rocket/android/settings/ui/SettingsFragment.kt
+++ b/app/src/main/java/chat/rocket/android/settings/ui/SettingsFragment.kt
@@ -122,7 +122,7 @@ class SettingsFragment : Fragment(), SettingsView, AdapterView.OnItemClickListen
             resources.getStringArray(R.array.settings_actions)[7] -> activity?.startActivity(
                 context?.webViewIntent(
                     getString(R.string.license_url),
-                    getString(R.string.title_licence)
+                    getString(R.string.title_license)
                 )
             )
 
@@ -169,7 +169,7 @@ class SettingsFragment : Fragment(), SettingsView, AdapterView.OnItemClickListen
             resources.getStringArray(R.array.widechat_settings_actions)[3] ->activity?.startActivity(
                 context?.webViewIntent(
                     getString(R.string.license_url),
-                    getString(R.string.title_licence)
+                    getString(R.string.title_license)
                 )
             )
 
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 96c01b9581..f2343fa5c9 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -23,7 +23,7 @@
     <string name="title_update_profile">تحديث الملف الشخصي</string>
     <string name="title_about">عنا</string>
     <string name="title_create_channel">إنشاء قناة</string>
-    <string name="title_licence">الترخيص</string>
+    <string name="title_license">الترخيص</string>
     <string name="title_are_you_sure">هل أنت متأكد؟</string>
     <string name="title_channel_details">تفاصيل القناة</string>
     <string name="title_topic">موضوع</string>
@@ -71,7 +71,7 @@
         <item name="item_share_app">نشر البرنامج</item>
         <item name="item_rate_us">قيمنا</item>
         <item name="item_contact_us">اتصل بنا</item>
-        <item name="item_licence">الترخيص</item>
+        <item name="item_license">الترخيص</item>
         <item name="item_about">عنا</item>
     </string-array>
 
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index c5ba76d2aa..4fec639184 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -31,7 +31,7 @@
     <string name="title_topic">Thema</string>
     <string name="title_announcement">Ankündigung</string>
     <string name="title_description">Beschreibung</string>
-    <string name="title_licence">Lizenz</string>
+    <string name="title_license">Lizenz</string>
 
     <!-- Actions -->
     <string name="action_connect">Verbinde</string>
@@ -74,7 +74,7 @@
         <item name="item_share_app">Link zur App teilen</item>
         <item name="item_rate_us">Bewerten Sie uns</item>
         <item name="item_contact_us">Kontaktieren Sie uns</item>
-        <item name="item_licence">Lizenz</item>
+        <item name="item_license">Lizenz</item>
         <item name="item_about">Über</item>
     </string-array>
 
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index daaec47f00..46e06a867d 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -25,7 +25,7 @@
     <string name="title_create_channel">Crear canal</string>
     <string name="title_create_group">Crear grupos</string>
     <string name="title_group_members">Miembros del Grupo</string>
-    <string name="title_licence">Licencia</string>
+    <string name="title_license">Licencia</string>
     <string name="title_are_you_sure">Estás seguro?</string>
     <string name="title_channel_details">detalles del canal</string>
     <string name="title_topic">Tema</string>
@@ -74,7 +74,7 @@
         <item name="item_share_app">Share app</item> <!-- TODO Add translation -->
         <item name="item_rate_us">Rate us</item> <!-- TODO Add translation -->
         <item name="item_contact_us">Contact us</item> <!-- TODO Add translation -->
-        <item name="item_licence">Licence</item> <!-- TODO Add translation -->
+        <item name="item_license">License</item> <!-- TODO Add translation -->
         <item name="item_about">About</item> <!-- TODO Add translation -->
     </string-array>
 
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index 1def3002bf..c7d8cf43df 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -22,7 +22,7 @@
     <string name="title_update_profile">به روزرسانی نمایه</string>
     <string name="title_about">درباره</string>
     <string name="title_create_channel">ایجاد کانال</string>
-    <string name="title_licence">مجوز</string>
+    <string name="title_license">مجوز</string>
     <string name="title_are_you_sure">آیا مطمئن هستید؟</string>
     <string name="title_channel_details">جزئیات کانال</string>
     <string name="title_topic">موضوع</string>
@@ -70,7 +70,7 @@
         <item name="change_language">Change language</item> <!-- TODO Add translation -->
         <item name="item_rate_us">به ما امتیاز دهید</item>
         <item name="item_contact_us">تماس با ما</item>
-        <item name="item_licence">مجوز</item>
+        <item name="item_license">مجوز</item>
         <item name="item_about">درباره</item>
     </string-array>
 
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 23dfc74c92..ce244fb470 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -23,7 +23,7 @@
     <string name="title_update_profile">Mettre à jour le profil</string>
     <string name="title_about">À propos</string>
     <string name="title_create_channel">Créer salon</string>
-    <string name="title_licence">les permis</string>
+    <string name="title_license">les permis</string>
     <string name="title_are_you_sure">Êtes-vous sûr?</string>
     <string name="title_channel_details">Détails de la chaîne</string>
     <string name="title_topic">Sujet</string>
@@ -72,7 +72,7 @@
         <item name="item_share_app">Partager l\'application</item>
         <item name="item_rate_us">Évaluez nous</item>
         <item name="item_contact_us">Contactez nous</item>
-        <item name="item_licence">les permis</item>
+        <item name="item_license">les permis</item>
         <item name="item_about">Sur</item>
     </string-array>
 
diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml
index edaf0f11fe..1d45d4d835 100644
--- a/app/src/main/res/values-hi-rIN/strings.xml
+++ b/app/src/main/res/values-hi-rIN/strings.xml
@@ -23,7 +23,7 @@
     <string name="title_update_profile">प्रोफ़ाइल अपडेट करें</string>
     <string name="title_about">परिचय</string>
     <string name="title_create_channel">चैनल बनाएं</string>
-    <string name="title_licence">लाइसेंस</string>
+    <string name="title_license">लाइसेंस</string>
     <string name="title_are_you_sure">क्या आपको यकीन है?</string>
     <string name="title_channel_details">चैनल विवरण</string>
     <string name="title_topic">विषय</string>
@@ -72,7 +72,7 @@
         <item name="item_share_app">ऐप शेयर करें</item>
         <item name="item_rate_us">हमें रेटिंग दें</item>
         <item name="item_contact_us">हमसे संपर्क करें</item>
-        <item name="item_licence">लाइसेंस</item>
+        <item name="item_license">लाइसेंस</item>
         <item name="item_about">के बारे में</item>
     </string-array>
 
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 3292c42b9c..5028c57fa7 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -22,7 +22,7 @@
     <string name="title_update_profile">Aggiorna Profilo</string>
     <string name="title_about">Informazioni</string>
     <string name="title_create_channel">Crea Canale</string>
-    <string name="title_licence">licenza</string>
+    <string name="title_license">licenza</string>
     <string name="title_are_you_sure">Sei sicuro che vuoi uscire ?</string>
     <string name="title_channel_details">Allegare un file</string>
     <string name="title_topic">Argomento</string>
@@ -70,7 +70,7 @@
         <item name="item_share_app">Condividi app</item>
         <item name="item_rate_us">Votaci</item>
         <item name="item_contact_us">Contattaci</item>
-        <item name="item_licence">Licenza</item>
+        <item name="item_license">Licenza</item>
         <item name="item_about">Di</item>
     </string-array>
 
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 1334e1340a..fc170abdb3 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -22,7 +22,7 @@
     <string name="title_password">パスワードの変更</string>
     <string name="title_update_profile">プロフィールの更新</string>
     <string name="title_about">About</string><!-- TODO Add translation -->
-    <string name="title_licence">Licence</string> <!-- TODO Add translation -->
+    <string name="title_license">License</string> <!-- TODO Add translation -->
     <string name="title_create_channel">新しいチャネルを作成</string>
     <string name="title_are_you_sure">本気ですか？</string>
     <string name="title_channel_details">Channel Details</string> <!-- TODO add translation -->
@@ -71,7 +71,7 @@
         <item name="item_share_app">Share app</item> <!-- TODO Add translation -->
         <item name="item_rate_us">Rate us</item> <!-- TODO Add translation -->
         <item name="item_contact_us">Contact us</item> <!-- TODO Add translation -->
-        <item name="item_licence">Licence</item> <!-- TODO Add translation -->
+        <item name="item_license">License</item> <!-- TODO Add translation -->
         <item name="item_about">About</item> <!-- TODO Add translation -->
     </string-array>
 
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 6f7ce445d6..996101988c 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -23,7 +23,7 @@
     <string name="title_update_profile">Editar perfil</string>
     <string name="title_about">Sobre</string>
     <string name="title_create_channel">Criar chat</string>
-    <string name="title_licence">Licença</string>
+    <string name="title_license">Licença</string>
     <string name="title_are_you_sure">Você tem certeza?</string>
     <string name="title_channel_details">Detalhes do canal</string>
     <string name="title_topic">Tópico</string>
@@ -72,7 +72,7 @@
         <item name="item_share_app">Compartilhar app</item>
         <item name="item_rate_us">Classifique-nos</item>
         <item name="item_contact_us">Contate-nos</item>
-        <item name="item_licence">Licença</item>
+        <item name="item_license">Licença</item>
         <item name="item_about">Sobre</item>
     </string-array>
 
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index f57dcd0529..c45309f007 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -22,7 +22,7 @@
     <string name="title_update_profile">Actualizar perfil</string>
     <string name="title_about">Acerca</string>
     <string name="title_create_channel">Criar Canal</string>
-    <string name="title_licence">Licença</string>
+    <string name="title_license">Licença</string>
     <string name="title_are_you_sure">Tem a certeza?</string>
     <string name="title_channel_details">Detalhes do Canal</string>
     <string name="title_topic">Tópico</string>
@@ -68,7 +68,7 @@
         <item name="item_share_app">Partilhe a aplicação</item>
         <item name="item_rate_us">Avalie-nos</item>
         <item name="item_contact_us">Contacte-nos</item>
-        <item name="item_licence">Licença</item>
+        <item name="item_license">Licença</item>
         <item name="item_about">Acerca</item>
     </string-array>
 
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index 3325b588f2..97f31694d3 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -27,7 +27,7 @@
     <string name="title_topic">Тема</string>
     <string name="title_announcement">Объявление</string>
     <string name="title_description">Описание</string>
-    <string name="title_licence">Лицензия</string>
+    <string name="title_license">Лицензия</string>
     <string name="title_are_you_sure">Вы уверены?</string>
 
     <!-- Actions -->
@@ -72,7 +72,7 @@
         <item name="item_share_app">Поделиться приложением</item>
         <item name="item_rate_us">Оцените нас</item>
         <item name="item_contact_us">Связаться с нами</item>
-        <item name="item_licence">Лицензия</item>
+        <item name="item_license">Лицензия</item>
         <item name="item_about">О программе</item>
     </string-array>
 
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 6d307a5364..65ba309223 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -23,7 +23,7 @@
     <string name="title_update_profile">Profilinizi Düzenleyin</string>
     <string name="title_about">Hakkında</string>
     <string name="title_create_channel">Yeni Kanal Oluştur</string>
-    <string name="title_licence">Licence</string> <!-- TODO Add translation -->
+    <string name="title_license">License</string> <!-- TODO Add translation -->
     <string name="title_are_you_sure">Are you sure?</string> <!-- TODO Add translation -->
     <string name="title_channel_details">Channel Details</string> <!-- TODO add translation -->
     <string name="title_topic">konu</string>
@@ -71,7 +71,7 @@
         <item name="item_share_app">Share app</item> <!-- TODO Add translation -->
         <item name="item_rate_us">Rate us</item> <!-- TODO Add translation -->
         <item name="item_contact_us">Contact us</item> <!-- TODO Add translation -->
-        <item name="item_licence">Licence</item> <!-- TODO Add translation -->
+        <item name="item_license">License</item> <!-- TODO Add translation -->
         <item name="item_about">About</item> <!-- TODO Add translation -->
     </string-array>
 
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 99b560e691..6edc207b55 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -23,7 +23,7 @@
     <string name="title_update_profile">Оновити профіль</string>
     <string name="title_about">"Про програму"</string>
     <string name="title_create_channel">Створити новий канал</string>
-    <string name="title_licence">Licence</string> <!-- TODO Add translation -->
+    <string name="title_license">License</string> <!-- TODO Add translation -->
     <string name="title_are_you_sure">Are you sure?</string> <!-- TODO Add translation -->
     <string name="title_channel_details">Channel Details</string> <!-- TODO add translation -->
     <string name="title_topic">Тема</string>
@@ -71,7 +71,7 @@
         <item name="item_share_app">Share app</item> <!-- TODO Add translation -->
         <item name="item_rate_us">Rate us</item> <!-- TODO Add translation -->
         <item name="item_contact_us">Contact us</item> <!-- TODO Add translation -->
-        <item name="item_licence">Licence</item> <!-- TODO Add translation -->
+        <item name="item_license">License</item> <!-- TODO Add translation -->
         <item name="item_about">About</item> <!-- TODO Add translation -->
     </string-array>
 
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 559f016347..1f1f9492fa 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -22,7 +22,7 @@
     <string name="title_update_profile">更新资料</string>
     <string name="title_about">关于</string>
     <string name="title_create_channel">新建频道</string>
-    <string name="title_licence">许可证</string>
+    <string name="title_license">许可证</string>
     <string name="title_are_you_sure">你确定?</string>
     <string name="title_channel_details">频道信息</string>
     <string name="title_topic">主题</string>
@@ -70,7 +70,7 @@
         <item name="item_share_app">分享app</item>
         <item name="item_rate_us">给我们打分</item>
         <item name="item_contact_us">联系我们</item>
-        <item name="item_licence">许可证</item>
+        <item name="item_license">许可证</item>
         <item name="item_about">关于</item>
     </string-array>
 
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index b7470e4211..49cf7c1c17 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -22,7 +22,7 @@
     <string name="title_update_profile">更新資料</string>
     <string name="title_about">關於</string>
     <string name="title_create_channel">建立新頻道</string>
-    <string name="title_licence">許可</string>
+    <string name="title_license">許可</string>
     <string name="title_are_you_sure">確定嗎?</string>
     <string name="title_channel_details">頻道訊息</string>
     <string name="title_topic">主題</string>
@@ -70,7 +70,7 @@
         <item name="item_share_app">分享這個App</item>
         <item name="item_rate_us">給我們一個評價</item>
         <item name="item_contact_us">聯絡我們</item>
-        <item name="item_licence">許可證</item>
+        <item name="item_license">許可證</item>
         <item name="item_about">關於</item>
     </string-array>
 
diff --git a/app/src/main/res/values/defaults.xml b/app/src/main/res/values/defaults.xml
index 6631a24fd1..de8d3adf63 100644
--- a/app/src/main/res/values/defaults.xml
+++ b/app/src/main/res/values/defaults.xml
@@ -13,5 +13,5 @@
     <string name="create_server_url" translatable="false">cloud.rocket.chat/trial</string>
     <string name="play_store_link" translatable="false">https://play.google.com/store/apps/details?id=chat.rocket.android</string>
     <string name="market_link" translatable="false">market://details?id=chat.rocket.android</string>
-    <string name="license_url" translatable="false">https://github.com/RocketChat/Rocket.Chat.Android/blob/develop/LICENSE</string>
+    <string name="license_url" translatable="false">https://github.com/WideChat/Rocket.Chat/blob/develop/LICENSE</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 42cf745b1f..d67d4bfe23 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -39,7 +39,7 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
     <string name="title_create_channel">Create Channel</string>
     <string name="title_create_group">Create Group</string>
     <string name="title_group_members">Group Members</string>
-    <string name="title_licence">Licence</string>
+    <string name="title_license">License</string>
     <string name="title_are_you_sure">Are you sure?</string>
     <string name="title_channel_details">Channel Details</string>
     <string name="title_topic">Topic</string>
@@ -89,7 +89,7 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
         <item name="item_share_app">Share app</item>
         <item name="item_rate_us">Rate us</item>
         <item name="item_contact_us">Contact us</item>
-        <item name="item_licence">Licence</item>
+        <item name="item_license">License</item>
         <item name="item_about">About</item>
     </string-array>