fetch api keys / oauth tokens from build type specific files

2 files changed, 4 insertions, 12 deletions

diff --git a/app/src/main/java/net/lacolaco/smileessence/twitter/OAuthSession.java b/app/src/main/java/net/lacolaco/smileessence/twitter/OAuthSession.java
index c7b475cc..8dcc5c28 100644
--- a/app/src/main/java/net/lacolaco/smileessence/twitter/OAuthSession.java
+++ b/app/src/main/java/net/lacolaco/smileessence/twitter/OAuthSession.java
@@ -51,7 +51,7 @@ public class OAuthSession {
     // --------------------- GETTER / SETTER METHODS ---------------------
 
     public String getAuthorizationURL() {
-        Twitter twitter = new TwitterFactory(TwitterApi.getConf()).getInstance();
+        Twitter twitter = new TwitterFactory().getInstance();
         RequestTokenTask task = new RequestTokenTask(twitter);
         task.execute();
         try {
@@ -67,7 +67,7 @@ public class OAuthSession {
     // -------------------------- OTHER METHODS --------------------------
 
     public AccessToken getAccessToken(String pinCode) {
-        Twitter twitter = new TwitterFactory(TwitterApi.getConf()).getInstance();
+        Twitter twitter = new TwitterFactory().getInstance();
         AccessTokenTask task = new AccessTokenTask(twitter, requestToken, pinCode);
         task.execute();
         try {
diff --git a/app/src/main/java/net/lacolaco/smileessence/twitter/TwitterApi.java b/app/src/main/java/net/lacolaco/smileessence/twitter/TwitterApi.java
index 4b940fb1..a5f670c2 100644
--- a/app/src/main/java/net/lacolaco/smileessence/twitter/TwitterApi.java
+++ b/app/src/main/java/net/lacolaco/smileessence/twitter/TwitterApi.java
@@ -57,14 +57,6 @@ public class TwitterApi {
         this.tokenSecret = tokenSecret;
     }
 
-    public static Configuration getConf() {
-        ConfigurationBuilder conf = new ConfigurationBuilder();
-        conf.setOAuthConsumerKey(BuildConfig.CONSUMER_KEY);
-        conf.setOAuthConsumerSecret(BuildConfig.CONSUMER_SECRET);
-        conf.setDebugEnabled(true);
-        return conf.build();
-    }
-
     public static Twitter getTwitter(Account account) {
         return new TwitterApi(account).getTwitter();
     }
@@ -72,13 +64,13 @@ public class TwitterApi {
     // --------------------- GETTER / SETTER METHODS ---------------------
 
     public Twitter getTwitter() {
-        Twitter twitter = new TwitterFactory(getConf()).getInstance();
+        Twitter twitter = new TwitterFactory().getInstance();
         twitter.setOAuthAccessToken(new AccessToken(token, tokenSecret));
         return twitter;
     }
 
     public TwitterStream getTwitterStream() {
-        TwitterStream stream = new TwitterStreamFactory(getConf()).getInstance();
+        TwitterStream stream = new TwitterStreamFactory().getInstance();
         stream.setOAuthAccessToken(new AccessToken(token, tokenSecret));
         return stream;
     }