From 61f6cdbf20536fef66fe876ebf7de0d3914b0af0 Mon Sep 17 00:00:00 2001 From: Long Tran Date: Thu, 21 Sep 2017 15:40:03 +0200 Subject: [PATCH 1/4] new api url --- app/build.gradle | 4 ++-- .../tlongdev/bktf/interactor/TlongdevPriceListInteractor.java | 2 +- .../java/com/tlongdev/bktf/network/TlongdevInterface.java | 2 +- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 1d1f3d2c..375161c6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,7 +8,7 @@ def getKey(Properties properties, String name, String defaultValue) { android { compileSdkVersion 24 - buildToolsVersion '24' + buildToolsVersion '25.0.0' defaultConfig { applicationId "com.tlongdev.bktf" @@ -33,7 +33,7 @@ android { 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 { diff --git a/app/src/main/java/com/tlongdev/bktf/interactor/TlongdevPriceListInteractor.java b/app/src/main/java/com/tlongdev/bktf/interactor/TlongdevPriceListInteractor.java index 25272065..bcacf5a7 100644 --- a/app/src/main/java/com/tlongdev/bktf/interactor/TlongdevPriceListInteractor.java +++ b/app/src/main/java/com/tlongdev/bktf/interactor/TlongdevPriceListInteractor.java @@ -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(); diff --git a/app/src/main/java/com/tlongdev/bktf/network/TlongdevInterface.java b/app/src/main/java/com/tlongdev/bktf/network/TlongdevInterface.java index e55b4905..6d9c4f7f 100644 --- a/app/src/main/java/com/tlongdev/bktf/network/TlongdevInterface.java +++ b/app/src/main/java/com/tlongdev/bktf/network/TlongdevInterface.java @@ -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 getItemSchema(); diff --git a/build.gradle b/build.gradle index e1189b5e..6158ab11 100644 --- a/build.gradle +++ b/build.gradle @@ -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' diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d5705170..4f075b1e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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 From 2e10c4c8a7188394b4104c7a1c7cf13a90572e25 Mon Sep 17 00:00:00 2001 From: Long Tran Date: Thu, 21 Sep 2017 15:40:21 +0200 Subject: [PATCH 2/4] remove steam group link --- .../java/com/tlongdev/bktf/ui/activity/AboutActivity.java | 2 +- app/src/main/res/xml/pref_about.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/tlongdev/bktf/ui/activity/AboutActivity.java b/app/src/main/java/com/tlongdev/bktf/ui/activity/AboutActivity.java index e9d5a9b6..24497795 100644 --- a/app/src/main/java/com/tlongdev/bktf/ui/activity/AboutActivity.java +++ b/app/src/main/java/com/tlongdev/bktf/ui/activity/AboutActivity.java @@ -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))); } diff --git a/app/src/main/res/xml/pref_about.xml b/app/src/main/res/xml/pref_about.xml index a8268f5d..d8c40bb6 100644 --- a/app/src/main/res/xml/pref_about.xml +++ b/app/src/main/res/xml/pref_about.xml @@ -10,7 +10,7 @@ android:key="@string/pref_title_version" android:title="@string/pref_title_version"/> - @@ -18,7 +18,7 @@ android:action="android.intent.action.VIEW" android:data="http://steamcommunity.com/groups/bptfandroid"/> - + --> Date: Thu, 21 Sep 2017 15:58:34 +0200 Subject: [PATCH 3/4] debug keys --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 375161c6..4c5d94cd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -28,8 +28,8 @@ 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 = [ From 997e5d8f8b7278b9df39946f4c8c32cd0e234f1d Mon Sep 17 00:00:00 2001 From: Long Tran Date: Thu, 21 Sep 2017 15:58:49 +0200 Subject: [PATCH 4/4] 2.2.2 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 4c5d94cd..3030928c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,8 +14,8 @@ android { 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 ->