From 0f623996150549268ac2f9aa6fe94884ac37f539 Mon Sep 17 00:00:00 2001
From: redgloboli <71544926+redgloboli@users.noreply.github.com>
Date: Thu, 21 Oct 2021 08:20:45 +0200
Subject: [PATCH] Remove IRC info from app and docs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Álvaro Brey Vilas <alvaro.brey@nextcloud.com>
---
 CONTRIBUTING.md                                           | 4 ----
 README.md                                                 | 5 ++---
 .../owncloud/android/ui/activity/CommunityActivity.java   | 7 -------
 src/main/res/layout/community_layout.xml                  | 8 --------
 src/main/res/values/setup.xml                             | 1 -
 src/main/res/values/strings.xml                           | 2 --
 6 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 3075f84958..38c3df805b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,9 +1,5 @@
 # [Nextcloud](https://nextcloud.com) Android app
 
-[![irc](https://img.shields.io/badge/IRC-%23nextcloud%20on%20freenode-orange.svg)](https://webchat.freenode.net/?channels=nextcloud)
-[![irc](https://img.shields.io/badge/IRC-%23nextcloud--mobile%20on%20freenode-blue.svg)](https://webchat.freenode.net/?channels=nextcloud-mobile)
-
-
 # Index
 1. [Guidelines](#guidelines)
     1. [Issue reporting](#issue-reporting)
diff --git a/README.md b/README.md
index ba95608d35..1bc7ae5e4b 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # [Nextcloud](https://nextcloud.com) Android app :iphone:
 
-[![Build Status](https://drone.nextcloud.com/api/badges/nextcloud/android/status.svg)](https://drone.nextcloud.com/nextcloud/android) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/80401cb343854343b4d94acbfb72d3ec)](https://www.codacy.com/app/Nextcloud/android?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=nextcloud/android&amp;utm_campaign=Badge_Grade) [![Releases](https://img.shields.io/github/release/nextcloud/android.svg)](https://github.com/nextcloud/android/releases/latest) [![irc](https://img.shields.io/badge/IRC-%23nextcloud--mobile%20on%20freenode-blue.svg)](https://webchat.freenode.net/?channels=nextcloud-mobile)
+[![Build Status](https://drone.nextcloud.com/api/badges/nextcloud/android/status.svg)](https://drone.nextcloud.com/nextcloud/android) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/80401cb343854343b4d94acbfb72d3ec)](https://www.codacy.com/app/Nextcloud/android?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=nextcloud/android&amp;utm_campaign=Badge_Grade) [![Releases](https://img.shields.io/github/release/nextcloud/android.svg)](https://github.com/nextcloud/android/releases/latest)
 
 [<img src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png" 
       alt="Download from Google Play" 
@@ -16,7 +16,6 @@
 ## How to contribute :rocket:
 If you want to [contribute](https://nextcloud.com/contribute/) to Nextcloud, you are very welcome: 
 
-- on our IRC channels [![irc](https://img.shields.io/badge/IRC-%23nextcloud%20on%20freenode-orange.svg)](https://webchat.freenode.net/?channels=nextcloud) and [![irc](https://img.shields.io/badge/IRC-%23nextcloud--mobile%20on%20freenode-blue.svg)](https://webchat.freenode.net/?channels=nextcloud-mobile) on freenode
 - our forum at https://help.nextcloud.com
 - for translations of the app on [Transifex](https://www.transifex.com/nextcloud/nextcloud/android/)
 - opening issues and PRs (including a corresponding issue)
@@ -75,7 +74,7 @@ or
 
 ## Support :rescue_worker_helmet:
 
-If you need assistance or want to ask a question about the Android app, you are welcome to [ask for support](https://help.nextcloud.com/c/clients/android) in our Forums or the [IRC-Channel](https://webchat.freenode.net/?channels=nextcloud-mobile). If you have found a bug, feel free to [open a new Issue on GitHub](https://github.com/nextcloud/android/issues). Keep in mind, that this repository only manages the Android app. If you find bugs or have problems with the server/backend, you should ask the [Nextcloud server team](https://github.com/nextcloud/server) for help!
+If you need assistance or want to ask a question about the Android app, you are welcome to [ask for support](https://help.nextcloud.com/c/clients/android) in our Forums. If you have found a bug, feel free to [open a new Issue on GitHub](https://github.com/nextcloud/android/issues). Keep in mind, that this repository only manages the Android app. If you find bugs or have problems with the server/backend, you should ask the [Nextcloud server team](https://github.com/nextcloud/server) for help!
 
 ## Remarks :scroll:
 
diff --git a/src/main/java/com/owncloud/android/ui/activity/CommunityActivity.java b/src/main/java/com/owncloud/android/ui/activity/CommunityActivity.java
index ba6cdb6898..e7624e9e52 100644
--- a/src/main/java/com/owncloud/android/ui/activity/CommunityActivity.java
+++ b/src/main/java/com/owncloud/android/ui/activity/CommunityActivity.java
@@ -62,13 +62,6 @@ public class CommunityActivity extends DrawerActivity {
     protected void setupContent() {
         binding.communityReleaseCandidateText.setMovementMethod(LinkMovementMethod.getInstance());
 
-        TextView contributeIrcView = binding.communityContributeIrcText;
-        contributeIrcView.setMovementMethod(LinkMovementMethod.getInstance());
-        contributeIrcView.setText(Html.fromHtml(getString(R.string.community_contribute_irc_text) + " " +
-                                                    getString(R.string.community_contribute_irc_text_link,
-                                                              ThemeColorUtils.primaryColorToHexString(this),
-                                                              getString(R.string.irc_weblink))));
-
         TextView contributeForumView = binding.communityContributeForumText;
         contributeForumView.setMovementMethod(LinkMovementMethod.getInstance());
         contributeForumView.setText(Html.fromHtml(getString(R.string.community_contribute_forum_text) + " " +
diff --git a/src/main/res/layout/community_layout.xml b/src/main/res/layout/community_layout.xml
index 050cc46534..880adb62aa 100755
--- a/src/main/res/layout/community_layout.xml
+++ b/src/main/res/layout/community_layout.xml
@@ -86,14 +86,6 @@
                     android:text="@string/community_contribute_headline"
                     android:textAppearance="?android:attr/textAppearanceLarge" />
 
-                <TextView
-                    android:id="@+id/community_contribute_irc_text"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/community_contribute_irc_text"
-                    android:paddingBottom="@dimen/standard_quarter_padding"
-                    android:textAppearance="?android:attr/textAppearanceMedium"/>
-
                 <TextView
                     android:id="@+id/community_contribute_forum_text"
                     android:layout_width="wrap_content"
diff --git a/src/main/res/values/setup.xml b/src/main/res/values/setup.xml
index ba9a1b9261..3437d12331 100644
--- a/src/main/res/values/setup.xml
+++ b/src/main/res/values/setup.xml
@@ -95,7 +95,6 @@
     <string name="beta_apk_link" translatable="false">https://download.nextcloud.com/android/dev/latest.apk</string>
     <string name="play_store_register_beta" translatable="false">https://play.google.com/apps/testing/com.nextcloud.client</string>
     <string name="fdroid_link" translatable="false">https://f-droid.org/repository/browse/?fdid=com.nextcloud.client</string>
-    <string name="irc_weblink" translatable="false">http://webchat.freenode.net?channels=nextcloud-mobile</string>
     <string name="help_link" translatable="false">https://help.nextcloud.com/c/clients/android</string>
     <string name="translation_link" translatable="false">https://www.transifex.com/nextcloud/nextcloud/android/</string>
     <string name="contributing_link" translatable="false">https://github.com/nextcloud/android/blob/master/CONTRIBUTING.md</string>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 33d5ec5360..e84ff0073d 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -514,8 +514,6 @@
     <string name="community_release_candidate_headline">Release candidate</string>
     <string name="community_release_candidate_text">The release candidate (RC) is a snapshot of the upcoming release and is expected to be stable. Testing your individual setup could help ensure this. Sign up for testing on the Play store or manually look in the \"Version\" section of F-Droid.</string>
     <string name="community_contribute_headline">Actively Contribute</string>
-    <string name="community_contribute_irc_text">Join the chat on IRC:</string>
-    <string name="community_contribute_irc_text_link" translatable="false"> &lt;font color=\"%1$s\">&lt;a href=\"%2$s\">#nextcloud-mobile&lt;/a>&lt;/font></string>
     <string name="community_contribute_forum_text">Help others on the</string>
     <string name="community_contribute_forum_forum">forum</string>
     <string name="community_contribute_forum_text_link" translatable="false">&lt;font color=\"%1$s\">&lt;a href=\"%2$s\">%3$s&lt;/a>&lt;/font></string>