Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Some changes

This commit is contained in:
tom79 2019-12-16 18:44:48 +01:00
parent 52f026aa75
commit 66a968c472
6 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -138,8 +138,8 @@ dependencies {
implementation "ch.acra:acra-notification:$acraVersion" implementation "ch.acra:acra-notification:$acraVersion"
implementation 'com.github.stom79:Android-WYSIWYG-Editor:3.2.1' implementation 'com.github.stom79:Android-WYSIWYG-Editor:3.2.1'
implementation 'com.github.duanhong169:colorpicker:1.1.6' implementation 'com.github.duanhong169:colorpicker:1.1.6'
implementation 'com.github.penfeizhou.android.animation:apng:1.1.0' implementation 'com.github.penfeizhou.android.animation:apng:1.3.1'
implementation 'com.github.penfeizhou.android.animation:gif:1.1.0' implementation 'com.github.penfeizhou.android.animation:gif:1.3.1'
implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0'
implementation 'com.github.smarteist:autoimageslider:1.3.2' implementation 'com.github.smarteist:autoimageslider:1.3.2'
debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.0' debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.0'

2
app/src/main/java/app/fedilab/android/activities/BaseActivity.java
View File

@ -63,7 +63,7 @@ public class BaseActivity extends CyaneaAppCompatActivity {
.detectLeakedRegistrationObjects() .detectLeakedRegistrationObjects()
.detectActivityLeaks() .detectActivityLeaks()
.penaltyLog() .penaltyLog()
.penaltyDeath() // .penaltyDeath()
.build()); .build());
} }
canShowActionMode = true; canShowActionMode = true;

4
app/src/main/java/app/fedilab/android/activities/EditProfileActivity.java
View File

@ -456,10 +456,10 @@ public class EditProfileActivity extends BaseActivity implements OnRetrieveAccou
new Thread(new Runnable() { new Thread(new Runnable() {
@Override @Override
public void run() { public void run() {
GlideApp.get(getApplicationContext()).clearDiskCache(); Glide.get(getApplicationContext()).clearDiskCache();
} }
}).start(); }).start();
GlideApp.get(getApplicationContext()).clearMemory(); Glide.get(getApplicationContext()).clearMemory();
HashMap<String, String> newCustomFields = new HashMap<>(); HashMap<String, String> newCustomFields = new HashMap<>();
String key1, key2, key3, key4, val1, val2, val3, val4; String key1, key2, key3, key4, val1, val2, val3, val4;

7
app/src/main/java/app/fedilab/android/client/HttpsConnection.java
View File

@ -911,13 +911,10 @@ public class HttpsConnection {
// always check HTTP response code first // always check HTTP response code first
if (responseCode == HttpURLConnection.HTTP_OK) { if (responseCode == HttpURLConnection.HTTP_OK) {
// opens input stream from the HTTP connection // opens input stream from the HTTP connection
InputStream inputStream = httpsURLConnection.getInputStream(); return httpsURLConnection.getInputStream();
httpsURLConnection.getInputStream().close();
return inputStream;
} }
httpsURLConnection.getInputStream().close(); httpsURLConnection.getInputStream().close();
} catch (IOException | NoSuchAlgorithmException | KeyManagementException ignored) { } catch (IOException | NoSuchAlgorithmException | KeyManagementException ignored) {}
}
if (httpsURLConnection != null) if (httpsURLConnection != null)
try { try {
httpsURLConnection.getInputStream().close(); httpsURLConnection.getInputStream().close();

8
app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java
View File

@ -3507,7 +3507,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
imageView.setImageBitmap(null); imageView.setImageBitmap(null);
if (!url.trim().contains("missing.png") && !((Activity) context).isFinishing()) { if (!url.trim().contains("missing.png") && !((Activity) context).isFinishing()) {
if (!blur) { if (!blur) {
GlideApp.with(imageView.getContext()) Glide.with(imageView.getContext())
.asBitmap() .asBitmap()
.load(!attachment.getType().toLowerCase().equals("audio") ? url : R.drawable.ic_audio_wave) .load(!attachment.getType().toLowerCase().equals("audio") ? url : R.drawable.ic_audio_wave)
.thumbnail(0.1f) .thumbnail(0.1f)
@ -3531,7 +3531,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
} }
}); });
} else { } else {
GlideApp.with(imageView.getContext()) Glide.with(imageView.getContext())
.asBitmap() .asBitmap()
.load(!attachment.getType().toLowerCase().equals("audio") ? url : R.drawable.ic_audio_wave) .load(!attachment.getType().toLowerCase().equals("audio") ? url : R.drawable.ic_audio_wave)
.thumbnail(0.1f) .thumbnail(0.1f)
@ -3558,7 +3558,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
} else { } else {
if (!url.trim().contains("missing.png") && !((Activity) context).isFinishing()) { if (!url.trim().contains("missing.png") && !((Activity) context).isFinishing()) {
if (!blur) { if (!blur) {
GlideApp.with(imageView.getContext()) Glide.with(imageView.getContext())
.load(!attachment.getType().toLowerCase().equals("audio") ? url : R.drawable.ic_audio_wave) .load(!attachment.getType().toLowerCase().equals("audio") ? url : R.drawable.ic_audio_wave)
.thumbnail(0.1f) .thumbnail(0.1f)
.override(640, 480) .override(640, 480)
@ -3566,7 +3566,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
.transition(DrawableTransitionOptions.withCrossFade()) .transition(DrawableTransitionOptions.withCrossFade())
.into(imageView); .into(imageView);
} else { } else {
GlideApp.with(imageView.getContext()) Glide.with(imageView.getContext())
.load(!attachment.getType().toLowerCase().equals("audio") ? url : R.drawable.ic_audio_wave) .load(!attachment.getType().toLowerCase().equals("audio") ? url : R.drawable.ic_audio_wave)
.thumbnail(0.1f) .thumbnail(0.1f)
.override(640, 480) .override(640, 480)

3
app/src/main/java/app/fedilab/android/fragments/DisplayStatusFragment.java
View File

@ -72,7 +72,6 @@ import app.fedilab.android.client.Entities.RemoteInstance;
import app.fedilab.android.client.Entities.RetrieveFeedsParam; import app.fedilab.android.client.Entities.RetrieveFeedsParam;
import app.fedilab.android.client.Entities.Status; import app.fedilab.android.client.Entities.Status;
import app.fedilab.android.client.Entities.TagTimeline; 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.ArtListAdapter;
import app.fedilab.android.drawers.PeertubeAdapter; import app.fedilab.android.drawers.PeertubeAdapter;
import app.fedilab.android.drawers.PixelfedListAdapter; import app.fedilab.android.drawers.PixelfedListAdapter;
@ -160,7 +159,7 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
@Nullable @Nullable
@Override @Override
public RequestBuilder<?> getPreloadRequestBuilder(@NonNull String url) { public RequestBuilder<?> getPreloadRequestBuilder(@NonNull String url) {
return GlideApp.with(context) return Glide.with(context)
.load(url) .load(url)
.override(640, 480); .override(640, 480);
} }