Skip to content
This repository has been archived by the owner on Dec 6, 2020. It is now read-only.

Commit

Permalink
Merge pull request #50 from Longi94/hotfix
Browse files Browse the repository at this point in the history
2.2.2
  • Loading branch information
Longi94 authored Sep 21, 2017
2 parents 176f5a2 + 997e5d8 commit 976e085
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 14 deletions.
12 changes: 6 additions & 6 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ def getKey(Properties properties, String name, String defaultValue) {

android {
compileSdkVersion 24
buildToolsVersion '24'
buildToolsVersion '25.0.0'

defaultConfig {
applicationId "com.tlongdev.bktf"
minSdkVersion 14
targetSdkVersion 24
versionCode 49
versionName "2.2.1"
versionCode 50
versionName "2.2.2"

applicationVariants.all { variant ->
variant.outputs.each { output ->
Expand All @@ -28,12 +28,12 @@ android {
keys.load(project.rootProject.file('keys.properties').newDataInputStream())
}

buildConfigField("String", "BACKPACK_TF_API_KEY", "\"${getKey(keys, "BACKPACK_TF_API_KEY", "DUMMY_KEY")}\"")
buildConfigField("String", "STEAM_WEB_API_KEY", "\"${getKey(keys, "STEAM_WEB_API_KEY", "DUMMY_KEY")}\"")
buildConfigField("String", "BACKPACK_TF_API_KEY", "\"${getKey(keys, "BACKPACK_TF_API_KEY", "59726b45cf6c756db606045b")}\"")
buildConfigField("String", "STEAM_WEB_API_KEY", "\"${getKey(keys, "STEAM_WEB_API_KEY", "28FDEDBC9C629D932EC7E0AE4A25AC6A")}\"")
resValue("string", "BANNER_AD_UNIT_ID", "${getKey(keys, "BANNER_AD_UNIT_ID", "ca-app-pub-3940256099942544/6300978111")}")

manifestPlaceholders = [
fabricApiKey: "${getKey(keys, "FABRIC_API_KEY", "DUMMY_KEY")}"
fabricApiKey: "${getKey(keys, "FABRIC_API_KEY", "bfdf680832dd1c71d7b67b7e9e6d3e4a0107e18b")}"
]
}
buildTypes {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ public Integer run() {
}
}

Uri uri = Uri.parse("http://tlongdev.com/api/v1/prices").buildUpon()
Uri uri = Uri.parse("https://dragonbra.in/bptf/legacy/prices").buildUpon()
.appendQueryParameter("since", String.valueOf(latestUpdate))
.build();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
*/
public interface TlongdevInterface {

String BASE_URL = "http://tlongdev.com/api/v1/";
String BASE_URL = "https://dragonbra.in/bptf/legacy/";

@GET("item_schema")
Call<TlongdevItemSchemaPayload> getItemSchema();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ private void setupSimplePreferencesScreen() {
public boolean onPreferenceClick(Preference preference) {
//Start an email intent with my email as the target
Intent intent = new Intent(Intent.ACTION_SENDTO, Uri.fromParts(
"mailto", "dev@tlongdev.com", null));
"mailto", "tlongdev@gmail.com", null));
if (intent.resolveActivity(getPackageManager()) != null) {
startActivity(Intent.createChooser(intent, getString(R.string.message_send_email)));
}
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/xml/pref_about.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
android:key="@string/pref_title_version"
android:title="@string/pref_title_version"/>

<PreferenceScreen
<!--<PreferenceScreen
android:icon="@drawable/ic_steam_white_24dp"
android:title="@string/pref_title_steam">
<intent
android:action="android.intent.action.VIEW"
android:data="http://steamcommunity.com/groups/bptfandroid"/>
</PreferenceScreen>
</PreferenceScreen>-->

<PreferenceScreen
android:title="@string/pref_title_github_repo"
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ buildscript {
maven { url 'https://maven.fabric.io/public' }
}
dependencies {
classpath 'com.android.tools.build:gradle:2.1.2'
classpath 'com.android.tools.build:gradle:2.3.3'
classpath 'com.google.gms:google-services:3.0.0'
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
classpath 'io.fabric.tools:gradle:1.21.5'
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Wed Apr 10 15:27:10 PDT 2013
#Thu Sep 21 14:39:05 CEST 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

0 comments on commit 976e085

Please sign in to comment.