Fix crash when looking for details on an iconless asset

Update Master's hot fixes

app/src/main/java/com/herbron/moodl/Activities/CurrencyDetailsActivity.java

@@ -135,22 +135,25 @@ public class CurrencyDetailsActivity extends AppCompatActivity {
         Objects.requireNonNull(getSupportActionBar()).setDisplayOptions(ActionBar.DISPLAY_SHOW_HOME |
                 ActionBar.DISPLAY_SHOW_TITLE | ActionBar.DISPLAY_HOME_AS_UP | ActionBar.DISPLAY_USE_LOGO);
 
-        Bitmap result = Bitmap.createBitmap(150, 150, currency.getIcon().getConfig());
+        if(currency.getIcon() != null)
+        {
+            Bitmap result = Bitmap.createBitmap(150, 150, currency.getIcon().getConfig());
 
-        Paint paint = new Paint();
+            Paint paint = new Paint();
-        paint.setStyle(Paint.Style.FILL);
+            paint.setStyle(Paint.Style.FILL);
-        paint.setColor(ContextCompat.getColor(this, R.color.white));
+            paint.setColor(ContextCompat.getColor(this, R.color.white));
 
-        Canvas canvas = new Canvas(result);
+            Canvas canvas = new Canvas(result);
-        canvas.drawCircle(result.getHeight()/2, result.getWidth()/2, 75, paint);
+            canvas.drawCircle(result.getHeight()/2, result.getWidth()/2, 75, paint);
-        canvas.drawBitmap(Bitmap.createScaledBitmap(currency.getIcon(), 100, 100, false), result.getHeight()/2 - 50, result.getWidth()/2 - 50, null);
+            canvas.drawBitmap(Bitmap.createScaledBitmap(currency.getIcon(), 100, 100, false), result.getHeight()/2 - 50, result.getWidth()/2 - 50, null);
 
-        getSupportActionBar()
+            getSupportActionBar()
-                .setIcon(new BitmapDrawable(getResources(),
+                    .setIcon(new BitmapDrawable(getResources(),
-                        Bitmap.createScaledBitmap(result
+                            Bitmap.createScaledBitmap(result
-                                , (int) MoodlBox.convertDpToPx(25, getResources())
+                                    , (int) MoodlBox.convertDpToPx(25, getResources())
-                                , (int) MoodlBox.convertDpToPx(25, getResources())
+                                    , (int) MoodlBox.convertDpToPx(25, getResources())
-                                , false)));
+                                    , false)));
+        }
     }
 }
 /*for(int i = 0; i < dataChartList.size(); i++)

app/src/main/java/com/herbron/moodl/DataManagers/DataCrypter.java

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

build.gradle

@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     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