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 #46 from Longi94/development
Browse files Browse the repository at this point in the history 
v2.1.4 again
  • Loading branch information
@Longi94
Longi94 committed May 12, 2016
2 parents 34f7bc5 + 2aaaaec commit 2de6a47
Show file tree
Hide file tree
Showing 19 changed files with 313 additions and 338 deletions.
7 changes: 3 additions & 4 deletions app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ android {
applicationId "com.tlongdev.bktf"
minSdkVersion 14
targetSdkVersion 23
versionCode 45
versionName "2.1.3"
versionCode 46
versionName "2.1.4"

applicationVariants.all { variant ->
variant.outputs.each { output ->
Expand Down Expand Up @@ -52,7 +52,7 @@ android {
}

dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
compile fileTree(include: ['*.jar'], dir: 'libs', excludes: ['*sources.jar'])
testCompile 'junit:junit:4.12'
testCompile 'org.mockito:mockito-core:1.10.19'
testCompile "org.robolectric:robolectric:3.1-SNAPSHOT"
Expand Down Expand Up @@ -88,7 +88,6 @@ dependencies {
compile 'com.jakewharton:butterknife:8.0.1'
compile 'com.squareup.retrofit2:retrofit:2.0.2'
compile 'com.squareup.retrofit2:converter-gson:2.0.2'
compile 'com.squareup.retrofit2:converter-jackson:2.0.2'
}

apply plugin: 'com.google.gms.google-services'
Binary file added app/libs/jackson-core-2.7.4-sources.jar
View file
Binary file not shown.
Binary file added app/libs/jackson-core-2.7.4.jar
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion app/src/main/java/com/tlongdev/bktf/interactor/GetSearchedUserDataInteractor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ private void saveUserData(BackpackTfPayload payload) {
mUser.setName(player.getName());
mUser.setReputation(player.getBackpackTfReputation());
mUser.setInGroup(player.getBackpackTfGroup());
mUser.setBanned(player.getBackpackTfBanned());
mUser.setBanned(player.getBackpackTfBanned() != null);
mUser.setScammer(player.getSteamrepScammer());
mUser.setEconomyBanned(player.getBanCommunity());
mUser.setCommunityBanned(player.getBanCommunity());
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/tlongdev/bktf/interactor/GetUserDataInteractor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ private void saveUserData(BackpackTfPayload payload) {
mUser.setName(player.getName());
mUser.setReputation(player.getBackpackTfReputation());
mUser.setInGroup(player.getBackpackTfGroup());
mUser.setBanned(player.getBackpackTfBanned());
mUser.setBanned(player.getBackpackTfBanned() != null);
mUser.setScammer(player.getSteamrepScammer());
mUser.setEconomyBanned(player.getBanCommunity());
mUser.setCommunityBanned(player.getBanCommunity());
Expand Down
291 changes: 228 additions & 63 deletions app/src/main/java/com/tlongdev/bktf/interactor/TlongdevPriceListInteractor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,22 +23,25 @@
import android.os.AsyncTask;
import android.util.Log;

import com.crashlytics.android.Crashlytics;
import com.fasterxml.jackson.core.JsonFactory;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonToken;
import com.google.gson.stream.JsonReader;
import com.tlongdev.bktf.BptfApplication;
import com.tlongdev.bktf.R;
import com.tlongdev.bktf.data.DatabaseContract.PriceEntry;
import com.tlongdev.bktf.model.Item;
import com.tlongdev.bktf.model.Quality;
import com.tlongdev.bktf.network.TlongdevInterface;
import com.tlongdev.bktf.network.model.tlongdev.TlongdevPrice;
import com.tlongdev.bktf.network.model.tlongdev.TlongdevPricesPayload;
import com.tlongdev.bktf.util.Utility;

import java.io.IOException;
import java.util.List;
import java.io.InputStream;
import java.util.Vector;

import javax.inject.Inject;

import okhttp3.ResponseBody;
import retrofit2.Response;

/**
Expand Down Expand Up @@ -111,15 +114,10 @@ protected Integer doInBackground(Void... params) {
}
}

Response<TlongdevPricesPayload> response = mTlongdevInterface.getPrices(latestUpdate).execute();
Response<ResponseBody> response = mTlongdevInterface.getPrices(latestUpdate).execute();

if (response.body() != null) {
TlongdevPricesPayload payload = response.body();
if (payload.getSuccess() == 1) {
return insertPrices(payload.getPrices());
} else {
errorMessage = payload.getMessage();
}
return parseJson(response.body().byteStream());
} else if (response.raw().code() >= 500) {
errorMessage = "Server error: " + response.raw().code();
} else if (response.raw().code() >= 400) {
Expand All @@ -136,71 +134,238 @@ protected Integer doInBackground(Void... params) {
return -1;
}

private Integer insertPrices(List<TlongdevPrice> prices) {
//Iterator that will iterate through the mItems
private int parseJson(InputStream inputStream) throws IOException {
//Create a parser from the input stream for fast parsing and low impact on memory
JsonFactory factory = new JsonFactory();
JsonParser parser = factory.createParser(inputStream);

Vector<ContentValues> cVVector = new Vector<>();
int retVal = 0;
int count = 0;

for (TlongdevPrice price : prices) {
cVVector.add(buildContentValues(price));
//Not a JSON if it doesn't start with START OBJECT
if (parser.nextToken() != JsonToken.START_OBJECT) {
return -1;
}

if (price.getQuality() == 6 && price.getTradable() == 1 && price.getCraftable() == 1) {
if (price.getDefindex() == 143) { //buds
Utility.putDouble(mEditor, mContext.getString(R.string.pref_buds_raw), price.getValueRaw());
mEditor.apply();
} else if (price.getDefindex() == 5002) { //metal
while (parser.nextToken() != JsonToken.END_OBJECT) {
String name = parser.getCurrentName();
parser.nextToken();

double highPrice = price.getValueHigh() == null ? 0 : price.getValueHigh();
switch (name) {
case "success":
if (parser.getIntValue() == 0) {
retVal = 1;
}
break;
case "message":
errorMessage = parser.getText();
break;
case "count":
count = parser.getIntValue();
break;
case "prices":

while (parser.nextToken() != JsonToken.END_ARRAY) {
ContentValues values = buildContentValues(parser);
cVVector.add(values);
}

if (highPrice > price.getValue()) {
//If the metal has a high price, save the average as raw.
Utility.putDouble(mEditor, mContext.getString(R.string.pref_metal_raw_usd), ((price.getValue() + highPrice) / 2));
} else {
//save as raw price
Utility.putDouble(mEditor, mContext.getString(R.string.pref_metal_raw_usd), price.getValue());
if (cVVector.size() > 0) {
ContentValues[] cvArray = new ContentValues[cVVector.size()];
cVVector.toArray(cvArray);
//Insert all the data into the database
rowsInserted = mContext.getContentResolver()
.bulkInsert(PriceEntry.CONTENT_URI, cvArray);
Log.v(LOG_TAG, "inserted " + rowsInserted + " rows into prices table");
}
mEditor.apply();
} else if (price.getDefindex() == 5021) { //key
Utility.putDouble(mEditor, mContext.getString(R.string.pref_key_raw), price.getValueRaw());
mEditor.apply();
}
break;
}
}

if (cVVector.size() > 0) {
ContentValues[] cvArray = new ContentValues[cVVector.size()];
cVVector.toArray(cvArray);
//Insert all the data into the database
rowsInserted = mContext.getContentResolver()
.bulkInsert(PriceEntry.CONTENT_URI, cvArray);
Log.v(LOG_TAG, "inserted " + rowsInserted + " rows into prices table");
parser.close();

return retVal;
}

private ContentValues buildContentValues(JsonParser parser) throws IOException {
ContentValues values = new ContentValues();

int defindex = 0;
int quality = 0;
int tradable = 0;
int craftable = 0;
double value = 0;
Double high = null;
double raw = 0;

while (parser.nextToken() != JsonToken.END_OBJECT) {
parser.nextToken();
switch (parser.getCurrentName()) {
case "defindex":
Item item = new Item();
item.setDefindex(parser.getIntValue());
defindex = item.getFixedDefindex();
values.put(PriceEntry.COLUMN_DEFINDEX, defindex);
break;
case "quality":
quality = parser.getIntValue();
values.put(PriceEntry.COLUMN_ITEM_QUALITY, quality);
break;
case "tradable":
tradable = parser.getIntValue();
values.put(PriceEntry.COLUMN_ITEM_TRADABLE, tradable);
break;
case "craftable":
craftable = parser.getIntValue();
values.put(PriceEntry.COLUMN_ITEM_CRAFTABLE, craftable);
break;
case "price_index":
values.put(PriceEntry.COLUMN_PRICE_INDEX, parser.getIntValue());
break;
case "australium":
values.put(PriceEntry.COLUMN_AUSTRALIUM, parser.getIntValue());
break;
case "currency":
values.put(PriceEntry.COLUMN_CURRENCY, parser.getText());
break;
case "value":
value = parser.getDoubleValue();
values.put(PriceEntry.COLUMN_PRICE, value);
break;
case "value_high":
high = parser.getDoubleValue();
values.put(PriceEntry.COLUMN_PRICE_HIGH, high);
break;
case "value_raw":
raw = parser.getDoubleValue();
break;
case "last_update":
values.put(PriceEntry.COLUMN_LAST_UPDATE, parser.getLongValue());
break;
case "difference":
values.put(PriceEntry.COLUMN_DIFFERENCE, parser.getDoubleValue());
break;
}
}

values.put(PriceEntry.COLUMN_WEAPON_WEAR, 0);

if (quality == Quality.UNIQUE && tradable == 1 && craftable == 1) {
if (defindex == 143) { //buds
Utility.putDouble(mEditor, mContext.getString(R.string.pref_buds_raw), raw);
mEditor.apply();
} else if (defindex == 5002) { //metal

double highPrice = high == null ? 0 : high;

if (highPrice > value) {
//If the metal has a high price, save the average as raw.
Utility.putDouble(mEditor, mContext.getString(R.string.pref_metal_raw_usd), ((value + highPrice) / 2));
} else {
//save as raw price
Utility.putDouble(mEditor, mContext.getString(R.string.pref_metal_raw_usd), value);
}
mEditor.apply();
} else if (defindex == 5021) { //key
Utility.putDouble(mEditor, mContext.getString(R.string.pref_key_raw), raw);
mEditor.apply();
}
}

return prices.size();
return values;
}

private ContentValues buildContentValues(TlongdevPrice price) {
//Fix the defindex for pricing
Item item = new Item();
item.setDefindex(price.getDefindex());

//The DV that will contain all the data
ContentValues itemValues = new ContentValues();

//Put all the data into the content values
itemValues.put(PriceEntry.COLUMN_DEFINDEX, item.getFixedDefindex());
itemValues.put(PriceEntry.COLUMN_ITEM_QUALITY, price.getQuality());
itemValues.put(PriceEntry.COLUMN_ITEM_TRADABLE, price.getTradable());
itemValues.put(PriceEntry.COLUMN_ITEM_CRAFTABLE, price.getCraftable());
itemValues.put(PriceEntry.COLUMN_PRICE_INDEX, price.getPriceIndex());
itemValues.put(PriceEntry.COLUMN_AUSTRALIUM, price.getAustralium());
itemValues.put(PriceEntry.COLUMN_CURRENCY, price.getCurrency());
itemValues.put(PriceEntry.COLUMN_PRICE, price.getValue());
itemValues.put(PriceEntry.COLUMN_PRICE_HIGH, price.getValueHigh());
itemValues.put(PriceEntry.COLUMN_LAST_UPDATE, price.getLastUpdate());
itemValues.put(PriceEntry.COLUMN_DIFFERENCE, price.getDifference());
itemValues.put(PriceEntry.COLUMN_WEAPON_WEAR, 0);

return itemValues;
private ContentValues buildContentValues(JsonReader reader) throws IOException {
ContentValues values = new ContentValues();

int defindex = 0;
int quality = 0;
int tradable = 0;
int craftable = 0;
double value = 0;
Double high = null;
double raw = 0;

reader.beginObject();

while (reader.hasNext()) {
switch (reader.nextName()) {
case "defindex":
Item item = new Item();
item.setDefindex(reader.nextInt());
defindex = item.getFixedDefindex();
values.put(PriceEntry.COLUMN_DEFINDEX, defindex);
break;
case "quality":
quality = reader.nextInt();
values.put(PriceEntry.COLUMN_ITEM_QUALITY, quality);
break;
case "tradable":
tradable = reader.nextInt();
values.put(PriceEntry.COLUMN_ITEM_TRADABLE, tradable);
break;
case "craftable":
craftable = reader.nextInt();
values.put(PriceEntry.COLUMN_ITEM_CRAFTABLE, craftable);
break;
case "price_index":
values.put(PriceEntry.COLUMN_PRICE_INDEX, reader.nextInt());
break;
case "australium":
values.put(PriceEntry.COLUMN_AUSTRALIUM, reader.nextInt());
break;
case "currency":
values.put(PriceEntry.COLUMN_CURRENCY, reader.nextString());
break;
case "value":
value = reader.nextDouble();
values.put(PriceEntry.COLUMN_PRICE, value);
break;
case "value_high":
high = reader.nextDouble();
values.put(PriceEntry.COLUMN_PRICE_HIGH, high);
break;
case "value_raw":
raw = reader.nextDouble();
break;
case "last_update":
values.put(PriceEntry.COLUMN_LAST_UPDATE, reader.nextLong());
break;
case "difference":
values.put(PriceEntry.COLUMN_DIFFERENCE, reader.nextDouble());
break;
default:
reader.skipValue();;
break;
}
}
reader.endObject();
values.put(PriceEntry.COLUMN_WEAPON_WEAR, 0);

if (quality == Quality.UNIQUE && tradable == 1 && craftable == 1) {
if (defindex == 143) { //buds
Utility.putDouble(mEditor, mContext.getString(R.string.pref_buds_raw), raw);
mEditor.apply();
} else if (defindex == 5002) { //metal

double highPrice = high == null ? 0 : high;

if (highPrice > value) {
//If the metal has a high price, save the average as raw.
Utility.putDouble(mEditor, mContext.getString(R.string.pref_metal_raw_usd), ((value + highPrice) / 2));
} else {
//save as raw price
Utility.putDouble(mEditor, mContext.getString(R.string.pref_metal_raw_usd), value);
}
mEditor.apply();
} else if (defindex == 5021) { //key
Utility.putDouble(mEditor, mContext.getString(R.string.pref_key_raw), raw);
mEditor.apply();
}
}

return values;
}

/**
Expand Down
Loading

0 comments on commit 2de6a47

Please sign in to comment.