Compare commits

...

3 Commits

Author SHA1 Message Date
caa64fda6f Fix crash when looking for details on an iconless asset 2018-11-21 14:28:54 +01:00
6a1c2f032b Revert Graddle version 2018-11-19 21:39:47 +01:00
ac7db53812
Merge pull request #9 from TanguyHerbron/master
Update Master's hot fixes
2018-11-19 16:59:36 +01:00
4 changed files with 19 additions and 15 deletions

Binary file not shown.

View File

@ -135,6 +135,8 @@ public class CurrencyDetailsActivity extends AppCompatActivity {
Objects.requireNonNull(getSupportActionBar()).setDisplayOptions(ActionBar.DISPLAY_SHOW_HOME | Objects.requireNonNull(getSupportActionBar()).setDisplayOptions(ActionBar.DISPLAY_SHOW_HOME |
ActionBar.DISPLAY_SHOW_TITLE | ActionBar.DISPLAY_HOME_AS_UP | ActionBar.DISPLAY_USE_LOGO); ActionBar.DISPLAY_SHOW_TITLE | ActionBar.DISPLAY_HOME_AS_UP | ActionBar.DISPLAY_USE_LOGO);
if(currency.getIcon() != null)
{
Bitmap result = Bitmap.createBitmap(150, 150, currency.getIcon().getConfig()); Bitmap result = Bitmap.createBitmap(150, 150, currency.getIcon().getConfig());
Paint paint = new Paint(); Paint paint = new Paint();
@ -153,6 +155,7 @@ public class CurrencyDetailsActivity extends AppCompatActivity {
, false))); , false)));
} }
} }
}
/*for(int i = 0; i < dataChartList.size(); i++) /*for(int i = 0; i < dataChartList.size(); i++)
{*/ {*/
/*if(counter == offset) /*if(counter == offset)

View File

@ -82,7 +82,8 @@ public class DataCrypter {
} catch(NoSuchPaddingException | NoSuchAlgorithmException } catch(NoSuchPaddingException | NoSuchAlgorithmException
| InvalidKeyException | UnsupportedEncodingException | InvalidKeyException | UnsupportedEncodingException
| InvalidAlgorithmParameterException e) { | InvalidAlgorithmParameterException | BadPaddingException
| IllegalBlockSizeException e) {
e.printStackTrace(); e.printStackTrace();
} }

View File

@ -7,7 +7,7 @@ buildscript {
jcenter() jcenter()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.2.0' classpath 'com.android.tools.build:gradle:3.1.4'
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong