diff --git a/app/src/main/java/tr/com/erenkaynar/library/earthquake/MainActivity.java b/app/src/main/java/tr/com/erenkaynar/library/earthquake/MainActivity.java index 3e761c2..d45286e 100644 --- a/app/src/main/java/tr/com/erenkaynar/library/earthquake/MainActivity.java +++ b/app/src/main/java/tr/com/erenkaynar/library/earthquake/MainActivity.java @@ -22,7 +22,7 @@ protected void onCreate(Bundle savedInstanceState) { text = findViewById(R.id.textView); - EarthquakeAPI.initialize().setSource(Source.USGS).setEarthquakeAPIListener(new EarthquakeAPIListener() { + EarthquakeAPI.initialize().setSource(Source.AFAD).setEarthquakeAPIListener(new EarthquakeAPIListener() { @Override public void onLoaded(ArrayList earthquakes) { StringBuilder output = new StringBuilder(); diff --git a/library/build.gradle b/library/build.gradle index e55280f..9a63434 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -4,7 +4,7 @@ plugins { } group = 'com.github.sqayner' -version = '1.0.1' +version = '1.0.0' android { namespace 'tr.com.erenkaynar.library.earthquake' @@ -13,7 +13,7 @@ android { defaultConfig { minSdk 26 versionCode 1 - versionName "1.0.1" + versionName "1.0.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles "consumer-rules.pro" @@ -56,7 +56,7 @@ afterEvaluate { from components.release groupId = 'com.github.sqayner' artifactId = 'earthquake-library-java' - version = '1.0.1' + version = '1.0.0' } } } diff --git a/library/src/main/java/tr/com/erenkaynar/library/earthquake/sources/afad/AfadCallable.java b/library/src/main/java/tr/com/erenkaynar/library/earthquake/sources/afad/AfadCallable.java index 9b10c0d..878d8ef 100644 --- a/library/src/main/java/tr/com/erenkaynar/library/earthquake/sources/afad/AfadCallable.java +++ b/library/src/main/java/tr/com/erenkaynar/library/earthquake/sources/afad/AfadCallable.java @@ -10,7 +10,9 @@ import java.net.URL; import java.net.URLConnection; import java.nio.charset.StandardCharsets; -import java.time.Instant; +import java.time.LocalDateTime; +import java.time.ZoneOffset; +import java.time.format.DateTimeFormatter; import java.util.ArrayList; import tr.com.erenkaynar.library.earthquake.Constants; @@ -58,7 +60,10 @@ private ArrayList parse(String data) { latLong.setLatitude(Double.parseDouble(datas.get(1).html())); latLong.setLongitude(Double.parseDouble(datas.get(2).html())); earthquake.setCoordinates(latLong); - earthquake.setDatetime(Instant.parse(datas.get(0).html().replace(" ", "T") + ".000Z").minusSeconds(60 * 60 * 3)); + + DateTimeFormatter f = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + LocalDateTime ldt = LocalDateTime.parse(datas.get(0).html(), f); + earthquake.setDatetime(ldt.toInstant(ZoneOffset.ofHours(3))); earthquakes.add(earthquake); } diff --git a/library/src/main/java/tr/com/erenkaynar/library/earthquake/sources/kandilli/KandilliCallable.java b/library/src/main/java/tr/com/erenkaynar/library/earthquake/sources/kandilli/KandilliCallable.java index c027e70..1b37588 100644 --- a/library/src/main/java/tr/com/erenkaynar/library/earthquake/sources/kandilli/KandilliCallable.java +++ b/library/src/main/java/tr/com/erenkaynar/library/earthquake/sources/kandilli/KandilliCallable.java @@ -46,7 +46,6 @@ private ArrayList parse(ArrayList lines) { earthquake.setRevised(getRevised(earthquakeString)); earthquake.setDatetime(getDateTime(earthquakeString)); - earthquake.setDatetime(getDateTime(earthquakeString)); earthquake.setDepth(Double.parseDouble(earthquakeString.substring(41, 49).trim())); earthquake.setMagnitude(getMagnitude(earthquakeString)); earthquake.setLocation(earthquakeString.substring(71, 121).trim());