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

…fic apk's.

README.md

@@ -1,12 +1,11 @@
 [![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)
 
-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.
+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.
 
-[<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,22 +18,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
 
-If you have any bug reports, feature requests or questions please open an issue or send us a toot at [[email protected]](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 [[email protected]](https://mastodon.social/@Vavassor).
-The current maintainer is [[email protected]](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 70
-        versionName "10.0"
+        versionName "10.0.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-nl/strings.xml

@@ -218,19 +218,21 @@
     <string name="notification_title_summary">%d nieuwe interacties</string>
     <string name="description_account_locked">Besloten account</string>
     <string name="about_title_activity">Over</string>
-    <string name="about_tusky_version">Tusky %s</string>
-    <string name="about_tusky_license">Tusky is opensource- en vrije software. De licentie valt onder de GNU Algemene Publieke Licentie versie 3. Je kunt de licentie hier bekijken: https://www.gnu.org/licenses/gpl-3.0.nl.html</string>
+    <string name="about_tusky_version">Gab %s</string> <!-- JW : changed-->
+    <string name="about_tusky_license">Gab is opensource- en vrije software. De licentie valt onder de GNU Algemene Publieke Licentie versie 3. Je kunt de licentie hier bekijken: https://www.gnu.org/licenses/gpl-3.0.nl.html\n\n
+   Gab is een fork van Tusky (https://github.com/tuskyapp/Tusky) die geen nodes censureert die vrijheid van meningsuiting respecteren. 
+    </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">Projectwebsite:\n
-                    https://tusky.app</string>
+                    https://gab.com</string>
     <string name="about_bug_feature_request_site">Foutmeldingen &amp; nieuwe functies aanvragen:\n
-                    https://github.com/tuskyapp/Tusky/issues</string>
-    <string name="about_tusky_account">Tusky\'s profiel</string>
+                    https://github.com/johanw666/Gab/issues</string>
+    <string name="about_tusky_account">Gabs profiel</string>
     <string name="status_share_content">Deel de inhoud van de toot</string>
     <string name="status_share_link">Deel de link van de toot</string>
     <string name="status_media_images">Afbeeldingen</string>

app/src/main/res/values/donottranslate.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="tusky_website" translatable="false">https://tusky.app</string>
+    <string name="tusky_website" translatable="false">https://github.com/johanw666/Gab</string> // JW: change string
     <string name="about_app_version">%1$s %2$s</string>
 
     <string name="oauth_scheme" translatable="false">oauth2redirect</string>
-    <string name="preferences_file_key" translatable="false">com.keylesspalace.tusky.PREFERENCES</string>
+    <string name="preferences_file_key" translatable="false">com.gabai.gabby.PREFERENCES</string>
 
     <string name="at_symbol" translatable="false">\@</string>
     <string name="hash_symbol" translatable="false">#</string>
@@ -117,12 +117,10 @@
     </string>
 
     <string-array name="rick_roll_domains" translatable="false">
-        <item>gab.com</item>
-        <item>gab.ai</item>
-        <item>spinster.xyz</item>
+        // JW: we do not censor
     </string-array>
 
-    <string name="rick_roll_url">https://www.youtube.com/watch?v=dQw4w9WgXcQ</string>
+    <string name="rick_roll_url">https://gab.com/</string> // JW: change domain :-)
 
 
     <string-array name="poll_duration_names">

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

@@ -279,26 +279,28 @@
     <string name="description_account_locked">Locked Account</string>
 
     <string name="about_title_activity">About</string>
-    <string name="about_tusky_version">Tusky %s</string>
-    <string name="about_powered_by_tusky">Powered by Tusky</string>
-    <string name="about_tusky_license">Tusky is free and open-source software.
+    <string name="about_tusky_version">Gab %s</string> <!-- JW: changed-->
+    <string name="about_powered_by_tusky">Powered by Gab</string>  <!-- JW: changed-->
+    <string name="about_tusky_license">Gab is free and open-source software.
         It is licensed under the GNU General Public License Version 3.
-        You can view the license here: https://www.gnu.org/licenses/gpl-3.0.en.html</string>
+        You can view the license here: https://www.gnu.org/licenses/gpl-3.0.en.html .\n\n
+        Gab is a fork of Tusky (https://github.com/tuskyapp/Tusky) that does not censor free-speech nodes.
+        </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">
+    <string name="about_project_site">  <!-- JW: changed-->
         Project website:\n
-        https://tusky.app
+        https://gab.com
     </string>
-    <string name="about_bug_feature_request_site">
+    <string name="about_bug_feature_request_site">  <!-- JW: changed-->
         Bug reports &amp; feature requests:\n
-        https://github.com/tuskyapp/Tusky/issues
+        https://github.com/johanw666/Gab/issues
     </string>
-    <string name="about_tusky_account">Tusky\'s Profile</string>
+    <string name="about_tusky_account">Gabs Profile</string>  <!-- JW: changed-->
 
     <string name="status_share_content">Share content of toot</string>
     <string name="status_share_link">Share link to toot</string>
@@ -378,7 +380,7 @@
     <string name="expand_collapse_all_statuses">Expand/Collapse all statuses</string>
     <string name="action_open_toot">Open toot</string>
     <string name="restart_required">App restart required</string>
-    <string name="restart_emoji">You\'ll need to restart Tusky in order to apply these changes</string>
+    <string name="restart_emoji">You\'ll need to restart Gab in order to apply these changes</string>  <!-- JW: changed-->
     <string name="later">Later</string>
     <string name="restart">Restart</string>
     <string name="caption_systememoji">Your device\'s default emoji set</string>
@@ -394,7 +396,7 @@
     <string name="reblog_private">Boost to original audience</string>
     <string name="unreblog_private">Unboost</string>
 
-    <string name="license_description">Tusky contains code and assets from the following open source projects:</string>
+    <string name="license_description">Gab contains code and assets from the following open source projects:</string>  <!-- JW: changed-->
     <string name="license_apache_2">Licensed under the Apache License (copy below)</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>

instance-build.gradle

@@ -4,16 +4,16 @@ Note: Publishing a custom build on Google Play may violate the Google Play devel
  */
 
 // The app name
-ext.APP_NAME = "Tusky"
+ext.APP_NAME = "Gab"
 
 // The application id. Must be unique, e.g. based on your domain
-ext.APP_ID = "com.keylesspalace.tusky"
+ext.APP_ID = "com.gabai.gabby"
 
 // url of a custom app logo. Recommended size at least 600x600. Keep empty to use the Tusky elephant friend.
 ext.CUSTOM_LOGO_URL = ""
 
 // e.g. mastodon.social. Keep empty to not suggest any instance on the signup screen
-ext.CUSTOM_INSTANCE = ""
+ext.CUSTOM_INSTANCE = "gab.com"
 
 // link to your support account. Will be linked on the about page when not empty.
-ext.SUPPORT_ACCOUNT_URL = "https://mastodon.social/@Tusky"
+ext.SUPPORT_ACCOUNT_URL = ""