From 2bc707f5800dfd23ec577166889f1ecc337d220d Mon Sep 17 00:00:00 2001 From: Dave Todd Date: Wed, 31 Aug 2016 11:56:02 -0600 Subject: [PATCH] Got the API in place and working. NOTE: it is a file note source controlled. --- .gitignore | 1 + API_KEY_____README.txt | 13 +++++++++++++ app/build.gradle | 6 +++--- .../sunshine/app/sync/SunshineSyncAdapter.java | 2 +- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 6 files changed, 21 insertions(+), 7 deletions(-) create mode 100644 API_KEY_____README.txt diff --git a/.gitignore b/.gitignore index c35071df..afd4fdf7 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ project.properties ##Gradle-based build .gradle build/ +/app/src/main/res/values/API_KEY.xml diff --git a/API_KEY_____README.txt b/API_KEY_____README.txt new file mode 100644 index 00000000..f97be268 --- /dev/null +++ b/API_KEY_____README.txt @@ -0,0 +1,13 @@ +This app contains a file called "./app/src/main/res/values/API_KEY.xml" that is ignored by GitHub. + +This file contains the API key to the open weather website service. In order for this application +to work you will need to create this file and populate with the API key given to you. + +The format of the file is as contained within the lines: + +---------------------------------- + + + xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx + +---------------------------------- diff --git a/app/build.gradle b/app/build.gradle index 79af6450..828cd393 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -18,9 +18,9 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } - buildTypes.each { - it.buildConfigField 'String', 'OPEN_WEATHER_MAP_API_KEY', MyOpenWeatherMapApiKey - } +// buildTypes.each { +// it.buildConfigField 'String', 'OPEN_WEATHER_MAP_API_KEY', MyOpenWeatherMapApiKey +// } } dependencies { diff --git a/app/src/main/java/com/example/android/sunshine/app/sync/SunshineSyncAdapter.java b/app/src/main/java/com/example/android/sunshine/app/sync/SunshineSyncAdapter.java index 9aa52c96..bb711a34 100644 --- a/app/src/main/java/com/example/android/sunshine/app/sync/SunshineSyncAdapter.java +++ b/app/src/main/java/com/example/android/sunshine/app/sync/SunshineSyncAdapter.java @@ -146,7 +146,7 @@ public void onPerformSync(Account account, Bundle extras, String authority, Cont Uri builtUri = uriBuilder.appendQueryParameter(FORMAT_PARAM, format) .appendQueryParameter(UNITS_PARAM, units) .appendQueryParameter(DAYS_PARAM, Integer.toString(numDays)) - .appendQueryParameter(APPID_PARAM, BuildConfig.OPEN_WEATHER_MAP_API_KEY) + .appendQueryParameter(APPID_PARAM, context.getResources().getString(R.string.THE_OPEN_WEATHER_MAP_API_TOKEN))// BuildConfig.OPEN_WEATHER_MAP_API_KEY) .build(); URL url = new URL(builtUri.toString()); diff --git a/build.gradle b/build.gradle index cfad1887..7dd435be 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:1.0.0' + classpath 'com.android.tools.build:gradle:2.1.3' classpath 'com.google.gms:google-services:1.3.0-beta1' // NOTE: Do not place your application dependencies here; they belong diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0c71e760..40f69ddc 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 +#Wed Aug 31 11:46:39 MDT 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip