Skip to content

Commit

Permalink
Koala endpoint (kickstarter#238)
Browse files Browse the repository at this point in the history
* move koala to secrets

* copy over secrets

* tabs? spaces? i dunno

* delete configs

* use rsync?

* dot slash?

* back to cp
  • Loading branch information
mbrandonw authored Dec 5, 2016
1 parent c79a083 commit e963384
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 26 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -59,3 +59,5 @@ config/*.yml
app/src/main/java/com/kickstarter/libs/utils/Secrets.java
lib/milkrun/secrets.rb
app/src/main/assets/fonts/ss-kickstarter.otf
app/src/main/res/values/koala_endpoint.xml
app/src/debug/res/values/koala_endpoint.xml
12 changes: 10 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,18 @@ submodules:

secrets:
# Copy java secrets over, and fallback to the example secrets if they don't exist.
cp vendor/native-secrets/android/Secrets.java app/src/main/java/com/kickstarter/libs/utils/Secrets.java 2>/dev/null \
|| cp app/src/main/java/com/kickstarter/libs/utils/Secrets.java.example app/src/main/java/com/kickstarter/libs/utils/Secrets.java
cp vendor/native-secrets/android/Secrets.java app/src/main/java/com/kickstarter/libs/utils/Secrets.java \
|| cp app/src/main/java/com/kickstarter/libs/utils/Secrets.java.example app/src/main/java/com/kickstarter/libs/utils/Secrets.java

cp vendor/native-secrets/ruby/secrets.rb lib/milkrun/secrets.rb || true
cp vendor/native-secrets/fonts/ss-kickstarter.otf app/src/main/assets/fonts/ss-kickstarter.otf || true

# Copy koala endpoint configs over, and fallback to examples if they don't exist.
mkdir -p app/src/debug/res/values/
mkdir -p app/src/main/res/values/
cp vendor/native-secrets/android/koala_endpoint_debug.xml app/src/debug/res/values/koala_endpoint.xml \
|| cp config/koala_endpoint.xml.example app/src/debug/res/values/koala_endpoint.xml
cp vendor/native-secrets/android/koala_endpoint.xml app/src/main/res/values/koala_endpoint.xml \
|| cp config/koala_endpoint.xml.example app/src/main/res/values/koala_endpoint.xml

.PHONY: bootstrap bootstrap-circle dependencies secrets
4 changes: 0 additions & 4 deletions app/src/debug/res/values/strings.xml

This file was deleted.

22 changes: 4 additions & 18 deletions app/src/main/java/com/kickstarter/libs/utils/Secrets.java.example
Original file line number Diff line number Diff line change
Expand Up @@ -36,24 +36,10 @@ public final class Secrets {
}

public static final class RegExpPattern {
// ***REMOVED***
// ***REMOVED***
public static final Pattern API= Pattern.compile("\\Aapi\\z");

// environment.***REMOVED***
public static final Pattern HIVEQUEEN =
Pattern.compile("\\Adev\\z");

// ***REMOVED***
public static final Pattern ANDROID_PAY_1 =
Pattern.compile("\\Apay\\z");

// ***REMOVED***
// ***REMOVED***
public static final Pattern ANDROID_PAY_2 =
Pattern.compile("\\Apay\\z");

// staging
public static final Pattern API = Pattern.compile("\\Aapi\\z");
public static final Pattern HIVEQUEEN = Pattern.compile("\\Adev\\z");
public static final Pattern ANDROID_PAY_1 = Pattern.compile("\\Apay\\z");
public static final Pattern ANDROID_PAY_2 = Pattern.compile("\\Apay\\z");
public static final Pattern STAGING = Pattern.compile("\\Astaging\\z");
}
}
1 change: 0 additions & 1 deletion app/src/main/res/values/strings_config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
<string name="app_name">Kickstarter</string>
<string name="facebook_app_id">69103156693</string>
<string name="font_family_medium">sans-serif-medium</string>
<string name="koala_endpoint">https://***REMOVED***/native/track</string>
<string name="woohoo_duration">2000</string>

<string-array name="facebook_permissions_array">
Expand Down
4 changes: 4 additions & 0 deletions config/koala_endpoint.xml.example
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="koala_endpoint">http://dev/null</string>
</resources>
2 changes: 1 addition & 1 deletion vendor/native-secrets

0 comments on commit e963384

Please sign in to comment.