Removed censorship. Added a Gab branding. Split output into abi speci…

…fic apk's.

README.md

@@ -1,12 +1,8 @@
-[![Translate - with Weblate](https://img.shields.io/badge/translate%20with-Weblate-green.svg?style=flat)](https://weblate.tusky.app/) [![OpenCollective](https://opencollective.com/tusky/backers/badge.svg)](https://opencollective.com/tusky/) [![Build Status](https://app.bitrise.io/app/a3e773c3c57a894c/status.svg?token=qLu_Ti4Gp2LWcYT4eo2INQ&branch=master)](https://app.bitrise.io/app/a3e773c3c57a894c#/builds) 
-# Tusky
+# Gab
 
-![](/fastlane/metadata/android/en-US/images/icon.png)
+Gab is a beautiful Android client for [Mastodon](https://github.com/tootsuite/mastodon). Mastodon is an ActivityPub federated social network. That means no single entity controls the whole network, rather, like e-mail, volunteers and organisations operate their own independent servers, users from which can all interact with each other seamlessly.
 
-Tusky is a beautiful Android client for [Mastodon](https://github.com/tootsuite/mastodon). Mastodon is an ActivityPub federated social network. That means no single entity controls the whole network, rather, like e-mail, volunteers and organisations operate their own independent servers, users from which can all interact with each other seamlessly.
-
-[<img src="/assets/fdroid_badge.png" alt="Get it on F-Droid" height="80" />](https://f-droid.org/repository/browse/?fdid=com.keylesspalace.tusky)
-[<img src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png" alt="Get it on Google Play" height="80" />](https://play.google.com/store/apps/details?id=com.keylesspalace.tusky&utm_source=github&pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1)
+Gab is a fork of Tusky (https://github.com/tuskyapp/Tusky) that does not censor free-speech nodes.
 
 ## Features
 
@@ -19,23 +15,15 @@ Tusky is a beautiful Android client for [Mastodon](https://github.com/tootsuite/
 - Optimized for all screen sizes
 - Completely open-source - no non-free dependencies like Google services
 
-### Testing
-
-The nightly build from master is [available on Google Play](https://play.google.com/store/apps/details?id=com.keylesspalace.tusky.test). 
 
 ### Support
 
-Check out our [FAQs](https://github.com/tuskyapp/faq), your answer may already be answered.
-If you have any bug reports, feature requests or questions please open an issue or send us a toot at [Tusky@mastodon.social](https://mastodon.social/@Tusky)!
+If you have any bug reports, feature requests or questions please open an issue.
 
-For translating Tusky into your language, visit https://weblate.tusky.app/
+For translating Gab-changed strings into your language, please open an issue.
 
 ### Head of development
 
-This app was developed by [Vavassor@mastodon.social](https://mastodon.social/@Vavassor).
-The current maintainer is [ConnyDuck@chaos.social](https://chaos.social/@ConnyDuck).
-
-### Development chatroom
-https://riot.im/app/#/room/#Tusky:matrix.org
+This port was done by johanw666.
 
 ### 

app/build.gradle

@@ -6,12 +6,15 @@ apply plugin: 'kotlin-kapt'
 apply from: "../instance-build.gradle"
 
 def getGitSha = {
+/*
     def stdout = new ByteArrayOutputStream()
     exec {
         commandLine 'git', 'rev-parse', '--short', 'HEAD'
         standardOutput = stdout
     }
     return stdout.toString().trim()
+*/
+    return ""; // JW
 }
 
 android {
@@ -21,16 +24,31 @@ android {
         minSdkVersion 21
         targetSdkVersion 29
         versionCode 75
-        versionName "12.1"
+        versionName "12.1.0-JW"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
 
         resValue "string", "app_name", APP_NAME
+        setProperty("archivesBaseName", "Gab-$versionName") // JW: added
 
         buildConfigField("String", "CUSTOM_LOGO_URL", "\"$CUSTOM_LOGO_URL\"")
         buildConfigField("String", "CUSTOM_INSTANCE", "\"$CUSTOM_INSTANCE\"")
         buildConfigField("String", "SUPPORT_ACCOUNT_URL", "\"$SUPPORT_ACCOUNT_URL\"")
 
+        // JW: add abifilters
+        ndk {
+            abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
+        }
+
+        splits {
+            abi {
+                enable true
+                reset()
+                include 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
+                universalApk true
+            }
+        }
+
         kapt {
             arguments {
                 arg("room.schemaLocation", "$projectDir/schemas")

app/src/main/java/com/keylesspalace/tusky/AboutActivity.kt

@@ -44,6 +44,11 @@ class AboutActivity : BottomSheetActivity(), Injectable {
             viewUrl(BuildConfig.SUPPORT_ACCOUNT_URL)
         }
 
+        // JW: added
+        if(BuildConfig.SUPPORT_ACCOUNT_URL.isBlank()) {
+            tuskyProfileButton.hide()
+        }
+
         aboutLicensesButton.setOnClickListener {
             startActivityWithSlideInAnimation(Intent(this, LicenseActivity::class.java))
         }

app/src/main/java/com/keylesspalace/tusky/util/OkHttpUtils.java

@@ -76,7 +76,7 @@ private static Interceptor getUserAgentInterceptor() {
         return chain -> {
             Request originalRequest = chain.request();
             Request requestWithUserAgent = originalRequest.newBuilder()
-                    .header("User-Agent", "Tusky/"+ BuildConfig.VERSION_NAME+" Android/"+Build.VERSION.RELEASE)
+                    .header("User-Agent", "Gab/"+ BuildConfig.VERSION_NAME+" Android/"+Build.VERSION.RELEASE) // JW: change user agent name
                     .build();
             return chain.proceed(requestWithUserAgent);
         };

app/src/main/res/values-de/strings.xml

@@ -220,19 +220,23 @@
     <string name="notification_title_summary">%d neue Interaktionen</string>
     <string name="description_account_locked">Gesperrtes Profil</string>
     <string name="about_title_activity">Über</string>
-    <string name="about_tusky_license">Tusky ist freie und quelloffene Software. Es ist lizenziert unter der GNU General Public License Version 3. Du kannst dir die Lizenz hier anschauen: https://www.gnu.org/licenses/gpl-3.0.de.html</string>
+    <!-- JW: changed-->
+    <string name="about_tusky_license">Gab ist freie Open-Source-Software.
+        Es ist lizenziert unter der GNU General Public License Version 3.
+        Du kannst dir die Lizenz hier anschauen: https://www.gnu.org/licenses/gpl-3.0.de.html</string>
     <!-- note to translators:
          * you should think of “free” as in “free speech,” not as in “free beer”.
            We sometimes call it “libre software,” borrowing the French or Spanish word for “free” as in freedom,
            to show we do not mean the software is gratis. Source: https://www.gnu.org/philosophy/free-sw.html
          * the url can be changed to link to the localized version of the license.
     -->
-    <string name="about_project_site">Webseite des Projekts:
-\n https://tusky.app</string>
+    <string name="about_project_site">        Webseite des Projekts:\n
+        https://gab.com
+    </string>
     <string name="about_bug_feature_request_site">        Fehlermeldungen &amp; Verbesserungsvorschläge:\n
-        https://github.com/tuskyapp/Tusky/issues
+        https://github.com/johanw666/Gab/issues
     </string>
-    <string name="about_tusky_account">Tuskys Profil</string>
+    <string name="about_tusky_account">Gabs Profil</string>
     <string name="status_share_content">Inhalt teilen</string>
     <string name="status_share_link">Link teilen</string>
     <string name="status_media_images">Bilder</string>
@@ -282,7 +286,7 @@
     <string name="expand_collapse_all_statuses">Alle Beiträge aus-/einklappen</string>
     <string name="action_open_toot">Beitrag öffnen</string>
     <string name="restart_required">App-Neustart erforderlich</string>
-    <string name="restart_emoji">Du musst Tusky neustarten um die Änderungen anzuwenden</string>
+    <string name="restart_emoji">Du musst Gab neustarten um die Änderungen anzuwenden</string>
     <string name="later">Später</string>
     <string name="restart">Neustarten</string>
     <string name="caption_systememoji">Die Standard-Emojis deines Geräts</string>
@@ -294,7 +298,7 @@
     <string name="account_moved_description">%1$s ist umgezogen auf:</string>
     <string name="reblog_private">An ursprüngliches Publikum teilen</string>
     <string name="unreblog_private">nicht mehr teilen</string>
-    <string name="license_description">Tusky enthält Code und Inhalte von den folgenden Open-Source-Projekten:</string>
+    <string name="license_description">Gab enthält Code und Inhalte von den folgenden Open-Source-Projekten:</string>
     <string name="license_apache_2">Lizenziert unter der Apache-Lizenz (s. u.)</string>
     <string name="license_cc_by_4">CC-BY 4.0</string>
     <string name="license_cc_by_sa_4">CC-BY-SA 4.0</string>
@@ -404,7 +408,7 @@
     <string name="poll_duration_3_days">3 Tage</string>
     <string name="poll_duration_7_days">7 Tage</string>
     <string name="edit_poll">Editieren</string>
-    <string name="about_tusky_version">Tusky %s</string>
+    <string name="about_tusky_version">Gab %s</string>
     <string name="action_add_poll">Umfrage hinzufügen</string>
     <string name="pref_title_alway_open_spoiler">Beiträge mit Inhaltswarnungen immer ausklappen</string>
     <string name="description_poll">Umfrage mit den Möglichkeiten: %1$s, %2$s, %3$s, %4$s; %5$s</string>
@@ -424,7 +428,7 @@
     <string name="title_bookmarks">Lesezeichen</string>
     <string name="action_bookmark">Lesezeichen</string>
     <string name="action_view_bookmarks">Lesezeichen</string>
-    <string name="about_powered_by_tusky">Angetrieben durch Tusky</string>
+    <string name="about_powered_by_tusky">Angetrieben durch Gab</string>
     <string name="description_status_bookmarked">Als Lesezeichen gespeichert</string>
     <string name="select_list_title">Liste auswählen</string>
     <string name="list">Liste</string>

app/src/main/res/values-es/strings.xml

@@ -206,8 +206,8 @@
     <string name="notification_title_summary">%d nuevas interacciones</string>
     <string name="description_account_locked">Cuenta protegida</string>
     <string name="about_title_activity">Acerca de</string>
-    <string name="about_tusky_version">Tusky %s</string>
-    <string name="about_tusky_license">Tusky es un software libre y de código abierto.
+    <string name="about_tusky_version">Gab %s</string>
+    <string name="about_tusky_license">Gab es un software libre y de código abierto.
         Está licenciado bajo la licencia \"GNU General Public License Version 3\".
         Puedes leer sobre la misma en: https://www.gnu.org/licenses/gpl-3.0.en.html</string>
     <!-- note to translators:
@@ -217,12 +217,12 @@
          * the url can be changed to link to the localized version of the license.
     -->
     <string name="about_project_site">        Sitio del proyecto:\n
-        https://tusky.app
+        https://gab.com
     </string>
     <string name="about_bug_feature_request_site">        Reporte de errores y peticiones de características:\n
-        https://github.com/tuskyapp/Tusky/issues
+        https://github.com/johanw666/Gab/issues
     </string>
-    <string name="about_tusky_account">Perfil de Tusky</string>
+    <string name="about_tusky_account">Perfil de Gab</string>
     <string name="status_share_content">Compartir contenido</string>
     <string name="status_share_link">Compartir enlace</string>
     <string name="status_media_images">Imágenes</string>
@@ -283,7 +283,7 @@
     <string name="account_moved_description">%1$s se trasladó a:</string>
     <string name="reblog_private">Volver a compartir</string>
     <string name="unreblog_private">Dejar de compartir</string>
-    <string name="license_description">Tusky contiene código y recursos de los siguientes proyectos:</string>
+    <string name="license_description">Gab contiene código y recursos de los siguientes proyectos:</string>
     <string name="license_apache_2">Licenciado bajo Apache License (texto bajo la lista)</string>
     <string name="license_cc_by_4">CC BY 4.0</string>
     <string name="license_cc_by_sa_4">CC-BY-SA 4.0</string>
@@ -438,7 +438,7 @@
     <string name="action_schedule_toot">Programar estado</string>
     <string name="action_reset_schedule">Reiniciar</string>
     <string name="post_lookup_error_format">Error al buscar el post %s</string>
-    <string name="about_powered_by_tusky">Potenciado por Tusky</string>
+    <string name="about_powered_by_tusky">Potenciado por Gab</string>
     <string name="title_bookmarks">Marcadores</string>
     <string name="action_bookmark">Marcador</string>
     <string name="action_view_bookmarks">Marcadores</string>

app/src/main/res/values-fr/strings.xml

@@ -223,8 +223,8 @@
     <string name="notification_title_summary">%d nouvelles interactions</string>
     <string name="description_account_locked">Compte verrouillé</string>
     <string name="about_title_activity">À propos</string>
-    <string name="about_tusky_version">Tusky %s</string>
-    <string name="about_tusky_license">Tusky est une application libre et open source.
+    <string name="about_tusky_version">Gab %s</string>
+    <string name="about_tusky_license">Gab est une application libre et open source.
         Elle est publiée sous licence publique générale GNU version 3.
         Vous pouvez consulter la licence ici : https://www.gnu.org/licenses/gpl-3.0.fr.html</string>
     <!-- note to translators:
@@ -234,12 +234,12 @@
          * the url can be changed to link to the localized version of the license.
     -->
     <string name="about_project_site">      Site du projet :\n
-      https://tusky.app
+      https://gab.com
     </string>
     <string name="about_bug_feature_request_site">      Rapports d’anomalies &amp; demandes de fonctionnalités :\n
-      https://github.com/tuskyapp/Tusky/issues
+      https://github.com/johanw666/Gab/issues
     </string>
-    <string name="about_tusky_account">Profil de Tusky</string>
+    <string name="about_tusky_account">Profil de Gab</string>
     <string name="status_share_content">Partager le contenu du pouet</string>
     <string name="status_share_link">Partager le lien du pouet</string>
     <string name="status_media_images">Images</string>
@@ -307,7 +307,7 @@
     <string name="expand_collapse_all_statuses">Déplier/replier tout les statuts</string>
     <string name="action_open_toot">Ouvrir le pouet</string>
     <string name="restart_required">Un redémarrage de l’application est nécessaire</string>
-    <string name="restart_emoji">Vous devrez redémarrer Tusky pour appliquer ces modifications</string>
+    <string name="restart_emoji">Vous devrez redémarrer Gab pour appliquer ces modifications</string>
     <string name="later">Plus tard</string>
     <string name="restart">Redémarrer</string>
     <string name="caption_systememoji">Votre jeu d’émojis par défaut</string>
@@ -318,7 +318,7 @@
     <string name="account_moved_description">%1$s a déménagé vers :</string>
     <string name="reblog_private">Booster vers l’audience originale</string>
     <string name="unreblog_private">Annuler le boost</string>
-    <string name="license_description">Tusky contient du code et des ressources issus des projets open source suivants :</string>
+    <string name="license_description">Gab contient du code et des ressources issus des projets open source suivants :</string>
     <string name="license_apache_2">Sous licence Apache (copie ci-dessous)</string>
     <string name="license_cc_by_4">CC-BY 4.0</string>
     <string name="license_cc_by_sa_4">CC-BY-SA 4.0</string>
@@ -443,7 +443,7 @@
     <string name="action_schedule_toot">Planifier le pouet</string>
     <string name="action_reset_schedule">Réinitialiser</string>
     <string name="post_lookup_error_format">Erreur lors de la recherche du post %s</string>
-    <string name="about_powered_by_tusky">Propulsé par Tusky</string>
+    <string name="about_powered_by_tusky">Propulsé par Gab</string>
     <string name="title_bookmarks">Signets</string>
     <string name="action_bookmark">Marquer comme signet</string>
     <string name="action_view_bookmarks">Signets</string>