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 question may already be answered.
-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 78
-        versionName "13.1"
+        versionName "13.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.kt

@@ -48,7 +48,7 @@ fun okhttpClient(context: Context): OkHttpClient.Builder {
             val requestWithUserAgent = chain.request().newBuilder()
                 .header(
                     "User-Agent",
-                    "Tusky/${BuildConfig.VERSION_NAME} Android/${Build.VERSION.RELEASE} OkHttp/${OkHttp.VERSION}"
+                    "Gab/${BuildConfig.VERSION_NAME} Android/${Build.VERSION.RELEASE} OkHttp/${OkHttp.VERSION}" // JW: change user agent name
                 )
                 .build()
             chain.proceed(requestWithUserAgent)

app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,9 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android" android:layout_height="108dp" android:layout_width="108dp">
-    <background android:drawable="@drawable/ic_launcher_background"/>
-    <foreground>
-    <inset
-        android:inset="10%"
-        android:drawable="@drawable/ic_launcher_foreground" />
-    </foreground>
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>

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

@@ -226,9 +226,9 @@
          * the url can be changed to link to the localized version of the license.
     -->
     <string name="about_project_site">موقع المشروع :\n
-                   https://tusky.app</string>
+                   https://gab.com</string>
     <string name="about_bug_feature_request_site">تقارير الأخطاء و طلبات التحسينات على  :\n
-                   https://github.com/tuskyapp/Tusky/issues</string>
+                   https://github.com/johanw666/Gab/issues</string>
     <string name="about_tusky_account">الملف الشخصي لتوسكي</string>
     <string name="status_share_content">شارك محتوى التبويق</string>
     <string name="status_share_link">شارك الرابط إلى التبويق</string>

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

@@ -156,20 +156,20 @@
     <string name="notification_title_summary">%d interaccions noves</string>
     <string name="description_account_locked">Compte blocat</string>
     <string name="about_title_activity">Quant a</string>
-    <string name="about_tusky_version">Tusky %s</string>
-    <string name="about_tusky_license">Tusky és programari gratuït, lliure i de codi obert.
+    <string name="about_tusky_version">Gab %s</string>
+    <string name="about_tusky_license">Gab és programari gratuït, lliure i de codi obert.
         Està llicenciat en els termes de la Llicència Pública General GNU versió 3.
         Podeu trobar les llicència aquí: https://www.gnu.org/licenses/gpl-3.0.ca.html</string>
     <!-- note to translators: the url can be changed to link to the localized version of the license -->
     <string name="about_project_site">
         Lloc web del projecte:\n
-        https://tusky.app
+        https://gab.com
     </string>
     <string name="about_bug_feature_request_site">
         Informes d\'errors i peticions de funcionalitats:\n
-        https://github.com/tuskyapp/Tusky/issues
+        https://github.com/johanw666/Gab/issues
     </string>
-    <string name="about_tusky_account">Perfil del Tusky</string>
+    <string name="about_tusky_account">Perfil del Gab</string>
     <string name="status_share_content">Comparteix el contingut del toot</string>
     <string name="status_share_link">Comparteix l\'enllaç al toot</string>
     <string name="status_media_images">Imatges</string>
@@ -319,7 +319,7 @@
     <string name="account_moved_description">%1$s s\'ha trasllat a:</string>
     <string name="reblog_private">Tornar a impulsar</string>
     <string name="unreblog_private">No impulsar</string>
-    <string name="license_description">Tusky conté codi i recursos dels següents projectes:</string>
+    <string name="license_description">Gab conté codi i recursos dels següents projectes:</string>
     <string name="license_apache_2">Sota llicencia Apache (text a sota)</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>
@@ -420,7 +420,7 @@
     <string name="action_access_scheduled_toot">Toots programats</string>
     <string name="action_schedule_toot">Programar el toot</string>
     <string name="action_reset_schedule">Reiniciar</string>
-    <string name="about_powered_by_tusky">Desenvolupat per Tusky</string>
+    <string name="about_powered_by_tusky">Desenvolupat per Gab</string>
     <string name="description_status_bookmarked">Afegit a les adreces d\'interès.</string>
     <string name="select_list_title">Seleccionar la llista</string>
     <string name="list">Llista</string>