From c7cb045ea302046b3227e0dde37b9b5ecf96e801 Mon Sep 17 00:00:00 2001
From: nuclearfog <hatespirit666@gmail.com>
Date: Thu, 7 Jan 2021 23:33:32 +0100
Subject: [PATCH] added consumer key obfuscation

---
 app/build.gradle                                       |  5 +++++
 .../twidda/backend/engine/TwitterEngine.java           | 10 +++++++---
 build.gradle                                           |  1 +
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index ba818599..e731335d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,4 +1,5 @@
 apply plugin: 'com.android.application'
+apply plugin: 'io.michaelrocks.paranoid'
 
 android {
     buildToolsVersion '30.0.2'
@@ -33,6 +34,10 @@ android {
             versionNameSuffix '.DEBUG'
         }
     }
+    
+    paranoid {
+        enabled true
+    }
 }
 
 dependencies {
diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/engine/TwitterEngine.java b/app/src/main/java/org/nuclearfog/twidda/backend/engine/TwitterEngine.java
index bef168c4..e76bd98b 100644
--- a/app/src/main/java/org/nuclearfog/twidda/backend/engine/TwitterEngine.java
+++ b/app/src/main/java/org/nuclearfog/twidda/backend/engine/TwitterEngine.java
@@ -31,6 +31,7 @@ import java.net.URL;
 import java.util.LinkedList;
 import java.util.List;
 
+import io.michaelrocks.paranoid.Obfuscate;
 import twitter4j.DirectMessage;
 import twitter4j.GeoLocation;
 import twitter4j.IDs;
@@ -52,8 +53,12 @@ import twitter4j.conf.ConfigurationBuilder;
 /**
  * Backend for twitter API.
  */
+@Obfuscate
 public class TwitterEngine {
 
+    private static final String CONSUMER_KEY = BuildConfig.API_KEY_1;
+    private static final String CONSUMER_KEY_SECRET = BuildConfig.API_KEY_2;
+
     private static final TwitterEngine mTwitter = new TwitterEngine();
 
     private Twitter twitter;
@@ -68,14 +73,13 @@ public class TwitterEngine {
     private TwitterEngine() {
     }
 
-
     /**
      * Initialize Twitter4J instance
      */
     private void initTwitter() {
         ConfigurationBuilder builder = new ConfigurationBuilder();
-        builder.setOAuthConsumerKey(BuildConfig.API_KEY_1);
-        builder.setOAuthConsumerSecret(BuildConfig.API_KEY_2);
+        builder.setOAuthConsumerKey(CONSUMER_KEY);
+        builder.setOAuthConsumerSecret(CONSUMER_KEY_SECRET);
         // Twitter4J has its own proxy settings
         if (settings.isProxyEnabled()) {
             builder.setHttpProxyHost(settings.getProxyHost());
diff --git a/build.gradle b/build.gradle
index a9ad3f61..bd9aec12 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,6 +7,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.1.1'
+        classpath 'io.michaelrocks:paranoid-gradle-plugin:0.3.2'
     }
 }