Excluded api keys from repository

This commit is contained in:
daniel oeh 2012-07-30 14:04:27 +02:00
parent f9572feaa6
commit c9e6b79f02
3 changed files with 24 additions and 12 deletions

1
.gitignore vendored
View File

@ -27,3 +27,4 @@ local.properties
*.odg# *.odg#
proguard proguard
*.DS_Store *.DS_Store
src/de/danoeh/antennapod/util/flattr/FlattrConfig.java

View File

@ -0,0 +1,7 @@
package de.danoeh.antennapod.util.flattr;
/** Contains credentials to access the Flattr API*/
public class FlattrConfig {
static final String APP_KEY = "";
static final String APP_SECRET = "";
}

View File

@ -35,8 +35,6 @@ public class FlattrUtils {
private static final String TAG = "FlattrUtils"; private static final String TAG = "FlattrUtils";
private static final String HOST_NAME = "de.danoeh.antennapod"; private static final String HOST_NAME = "de.danoeh.antennapod";
private static final String APP_KEY = "oJ5B1Z90x0gpHbu84F81fWgZWjRpKj4Y";
private static final String APP_SECRET = "S0qKPpAcfGrNHMLCiKtnwAciJUyj3t8MjomZEN2KkjnSWZk4zEiW4k4D5sNZMLBV";
private static final String PREF_ACCESS_TOKEN = "de.danoeh.antennapod.preference.flattrAccessToken"; private static final String PREF_ACCESS_TOKEN = "de.danoeh.antennapod.preference.flattrAccessToken";
@ -49,7 +47,8 @@ public class FlattrUtils {
private static volatile AccessToken cachedToken; private static volatile AccessToken cachedToken;
private static AndroidAuthenticator createAuthenticator() { private static AndroidAuthenticator createAuthenticator() {
return new AndroidAuthenticator(HOST_NAME, APP_KEY, APP_SECRET); return new AndroidAuthenticator(HOST_NAME, FlattrConfig.APP_KEY,
FlattrConfig.APP_SECRET);
} }
public static void startAuthProcess(Context context) throws FlattrException { public static void startAuthProcess(Context context) throws FlattrException {
@ -61,15 +60,18 @@ public class FlattrUtils {
private static AccessToken retrieveToken() { private static AccessToken retrieveToken() {
if (cachedToken == null) { if (cachedToken == null) {
if (AppConfig.DEBUG) Log.d(TAG, "Retrieving access token"); if (AppConfig.DEBUG)
Log.d(TAG, "Retrieving access token");
String token = PreferenceManager.getDefaultSharedPreferences( String token = PreferenceManager.getDefaultSharedPreferences(
PodcastApp.getInstance()) PodcastApp.getInstance())
.getString(PREF_ACCESS_TOKEN, null); .getString(PREF_ACCESS_TOKEN, null);
if (token != null) { if (token != null) {
if (AppConfig.DEBUG) Log.d(TAG, "Found access token. Caching."); if (AppConfig.DEBUG)
Log.d(TAG, "Found access token. Caching.");
cachedToken = new AccessToken(token); cachedToken = new AccessToken(token);
} else { } else {
if (AppConfig.DEBUG) Log.d(TAG, "No access token found"); if (AppConfig.DEBUG)
Log.d(TAG, "No access token found");
return null; return null;
} }
} }
@ -82,7 +84,8 @@ public class FlattrUtils {
} }
public static void storeToken(AccessToken token) { public static void storeToken(AccessToken token) {
if (AppConfig.DEBUG) Log.d(TAG, "Storing token"); if (AppConfig.DEBUG)
Log.d(TAG, "Storing token");
SharedPreferences.Editor editor = PreferenceManager SharedPreferences.Editor editor = PreferenceManager
.getDefaultSharedPreferences(PodcastApp.getInstance()).edit(); .getDefaultSharedPreferences(PodcastApp.getInstance()).edit();
if (token != null) { if (token != null) {
@ -95,7 +98,8 @@ public class FlattrUtils {
} }
public static void deleteToken() { public static void deleteToken() {
if (AppConfig.DEBUG) Log.d(TAG, "Deleting flattr token"); if (AppConfig.DEBUG)
Log.d(TAG, "Deleting flattr token");
storeToken(null); storeToken(null);
} }
@ -127,7 +131,8 @@ public class FlattrUtils {
} }
public static void revokeAccessToken(Context context) { public static void revokeAccessToken(Context context) {
if (AppConfig.DEBUG) Log.d(TAG, "Revoking access token"); if (AppConfig.DEBUG)
Log.d(TAG, "Revoking access token");
deleteToken(); deleteToken();
FlattrServiceCreator.deleteFlattrService(); FlattrServiceCreator.deleteFlattrService();
showRevokeDialog(context); showRevokeDialog(context);
@ -150,7 +155,8 @@ public class FlattrUtils {
} }
public static void showNoTokenDialog(final Context context, final String url) { public static void showNoTokenDialog(final Context context, final String url) {
if (AppConfig.DEBUG) Log.d(TAG, "Creating showNoTokenDialog"); if (AppConfig.DEBUG)
Log.d(TAG, "Creating showNoTokenDialog");
AlertDialog.Builder builder = new AlertDialog.Builder(context); AlertDialog.Builder builder = new AlertDialog.Builder(context);
builder.setTitle(R.string.no_flattr_token_title); builder.setTitle(R.string.no_flattr_token_title);
builder.setMessage(R.string.no_flattr_token_msg); builder.setMessage(R.string.no_flattr_token_msg);
@ -220,7 +226,5 @@ public class FlattrUtils {
}); });
builder.create().show(); builder.create().show();
} }
} }