From 66a968c472c873dfa7a6d69c4eddb09b168c4afd Mon Sep 17 00:00:00 2001 From: tom79 Date: Mon, 16 Dec 2019 18:44:48 +0100 Subject: [PATCH] Some changes --- app/build.gradle | 4 ++-- .../java/app/fedilab/android/activities/BaseActivity.java | 2 +- .../fedilab/android/activities/EditProfileActivity.java | 4 ++-- .../java/app/fedilab/android/client/HttpsConnection.java | 7 ++----- .../app/fedilab/android/drawers/StatusListAdapter.java | 8 ++++---- .../fedilab/android/fragments/DisplayStatusFragment.java | 3 +-- 6 files changed, 12 insertions(+), 16 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index a804f3005..5592f4e38 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -138,8 +138,8 @@ dependencies { implementation "ch.acra:acra-notification:$acraVersion" implementation 'com.github.stom79:Android-WYSIWYG-Editor:3.2.1' implementation 'com.github.duanhong169:colorpicker:1.1.6' - implementation 'com.github.penfeizhou.android.animation:apng:1.1.0' - implementation 'com.github.penfeizhou.android.animation:gif:1.1.0' + implementation 'com.github.penfeizhou.android.animation:apng:1.3.1' + implementation 'com.github.penfeizhou.android.animation:gif:1.3.1' implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' implementation 'com.github.smarteist:autoimageslider:1.3.2' debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.0' diff --git a/app/src/main/java/app/fedilab/android/activities/BaseActivity.java b/app/src/main/java/app/fedilab/android/activities/BaseActivity.java index 876f57b4e..78e60929b 100644 --- a/app/src/main/java/app/fedilab/android/activities/BaseActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/BaseActivity.java @@ -63,7 +63,7 @@ public class BaseActivity extends CyaneaAppCompatActivity { .detectLeakedRegistrationObjects() .detectActivityLeaks() .penaltyLog() - .penaltyDeath() + // .penaltyDeath() .build()); } canShowActionMode = true; diff --git a/app/src/main/java/app/fedilab/android/activities/EditProfileActivity.java b/app/src/main/java/app/fedilab/android/activities/EditProfileActivity.java index a29b7d14e..7637cf5b2 100644 --- a/app/src/main/java/app/fedilab/android/activities/EditProfileActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/EditProfileActivity.java @@ -456,10 +456,10 @@ public class EditProfileActivity extends BaseActivity implements OnRetrieveAccou new Thread(new Runnable() { @Override public void run() { - GlideApp.get(getApplicationContext()).clearDiskCache(); + Glide.get(getApplicationContext()).clearDiskCache(); } }).start(); - GlideApp.get(getApplicationContext()).clearMemory(); + Glide.get(getApplicationContext()).clearMemory(); HashMap newCustomFields = new HashMap<>(); String key1, key2, key3, key4, val1, val2, val3, val4; diff --git a/app/src/main/java/app/fedilab/android/client/HttpsConnection.java b/app/src/main/java/app/fedilab/android/client/HttpsConnection.java index 7546c482f..f4929a5bf 100644 --- a/app/src/main/java/app/fedilab/android/client/HttpsConnection.java +++ b/app/src/main/java/app/fedilab/android/client/HttpsConnection.java @@ -911,13 +911,10 @@ public class HttpsConnection { // always check HTTP response code first if (responseCode == HttpURLConnection.HTTP_OK) { // opens input stream from the HTTP connection - InputStream inputStream = httpsURLConnection.getInputStream(); - httpsURLConnection.getInputStream().close(); - return inputStream; + return httpsURLConnection.getInputStream(); } httpsURLConnection.getInputStream().close(); - } catch (IOException | NoSuchAlgorithmException | KeyManagementException ignored) { - } + } catch (IOException | NoSuchAlgorithmException | KeyManagementException ignored) {} if (httpsURLConnection != null) try { httpsURLConnection.getInputStream().close(); diff --git a/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java index f9079f8f4..955779504 100644 --- a/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java @@ -3507,7 +3507,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct imageView.setImageBitmap(null); if (!url.trim().contains("missing.png") && !((Activity) context).isFinishing()) { if (!blur) { - GlideApp.with(imageView.getContext()) + Glide.with(imageView.getContext()) .asBitmap() .load(!attachment.getType().toLowerCase().equals("audio") ? url : R.drawable.ic_audio_wave) .thumbnail(0.1f) @@ -3531,7 +3531,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct } }); } else { - GlideApp.with(imageView.getContext()) + Glide.with(imageView.getContext()) .asBitmap() .load(!attachment.getType().toLowerCase().equals("audio") ? url : R.drawable.ic_audio_wave) .thumbnail(0.1f) @@ -3558,7 +3558,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct } else { if (!url.trim().contains("missing.png") && !((Activity) context).isFinishing()) { if (!blur) { - GlideApp.with(imageView.getContext()) + Glide.with(imageView.getContext()) .load(!attachment.getType().toLowerCase().equals("audio") ? url : R.drawable.ic_audio_wave) .thumbnail(0.1f) .override(640, 480) @@ -3566,7 +3566,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct .transition(DrawableTransitionOptions.withCrossFade()) .into(imageView); } else { - GlideApp.with(imageView.getContext()) + Glide.with(imageView.getContext()) .load(!attachment.getType().toLowerCase().equals("audio") ? url : R.drawable.ic_audio_wave) .thumbnail(0.1f) .override(640, 480) diff --git a/app/src/main/java/app/fedilab/android/fragments/DisplayStatusFragment.java b/app/src/main/java/app/fedilab/android/fragments/DisplayStatusFragment.java index f6258ced6..ec9e48d9e 100644 --- a/app/src/main/java/app/fedilab/android/fragments/DisplayStatusFragment.java +++ b/app/src/main/java/app/fedilab/android/fragments/DisplayStatusFragment.java @@ -72,7 +72,6 @@ import app.fedilab.android.client.Entities.RemoteInstance; import app.fedilab.android.client.Entities.RetrieveFeedsParam; import app.fedilab.android.client.Entities.Status; import app.fedilab.android.client.Entities.TagTimeline; -import app.fedilab.android.client.Glide.GlideApp; import app.fedilab.android.drawers.ArtListAdapter; import app.fedilab.android.drawers.PeertubeAdapter; import app.fedilab.android.drawers.PixelfedListAdapter; @@ -160,7 +159,7 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn @Nullable @Override public RequestBuilder getPreloadRequestBuilder(@NonNull String url) { - return GlideApp.with(context) + return Glide.with(context) .load(url) .override(640, 480); }