From 60022ff22e44c064d3fc1d0c29f6ac03906d22fa Mon Sep 17 00:00:00 2001 From: stom79 Date: Tue, 30 Oct 2018 17:15:29 +0100 Subject: [PATCH] some fixes --- .../mastodon/activities/MediaActivity.java | 19 ++++++++----------- .../mastodon/client/TLSSocketFactory.java | 6 ++++++ .../drawers/ConversationDecoration.java | 1 - .../fragments/DisplayStatusFragment.java | 10 +--------- 4 files changed, 15 insertions(+), 21 deletions(-) diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/MediaActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/MediaActivity.java index 545a0c78b..a6ba7b238 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/MediaActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/MediaActivity.java @@ -30,7 +30,6 @@ import android.support.annotation.NonNull; import android.support.v4.app.ActivityCompat; import android.support.v4.content.ContextCompat; import android.support.v7.widget.Toolbar; -import android.util.Log; import android.view.MotionEvent; import android.view.View; import android.widget.ImageButton; @@ -410,12 +409,18 @@ public class MediaActivity extends BaseActivity implements OnDownloadInterface { pbar_inf.setIndeterminate(false); pbar_inf.setScaleY(3f); File file = new File(getCacheDir() + "/" + Helper.md5(url)+".mp4"); + try { + HttpsURLConnection.setDefaultSSLSocketFactory(new TLSSocketFactory()); + } catch (KeyManagementException e) { + e.printStackTrace(); + } catch (NoSuchAlgorithmException e) { + e.printStackTrace(); + } if(file.exists()) { Uri uri = Uri.parse(file.getAbsolutePath()); videoView.setVisibility(View.VISIBLE); - Log.v(Helper.TAG,"uri 2: " + uri); + videoView.setVideoURI(uri); - videoView.seekTo(0); videoView.start(); MediaController mc = new MediaController(MediaActivity.this); videoView.setMediaController(mc); @@ -432,14 +437,6 @@ public class MediaActivity extends BaseActivity implements OnDownloadInterface { }else{ videoView.setVisibility(View.VISIBLE); Uri uri = Uri.parse(url); - try { - HttpsURLConnection.setDefaultSSLSocketFactory(new TLSSocketFactory()); - } catch (KeyManagementException e) { - e.printStackTrace(); - } catch (NoSuchAlgorithmException e) { - e.printStackTrace(); - } - Log.v(Helper.TAG,"uri 1: " + uri); videoView.setVideoURI(uri); videoView.start(); MediaController mc = new MediaController(MediaActivity.this); diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/client/TLSSocketFactory.java b/app/src/main/java/fr/gouv/etalab/mastodon/client/TLSSocketFactory.java index d7d4505cd..ebe7497ca 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/client/TLSSocketFactory.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/client/TLSSocketFactory.java @@ -7,6 +7,7 @@ import java.net.Socket; import java.security.KeyManagementException; import java.security.NoSuchAlgorithmException; import javax.net.ssl.SSLContext; +import javax.net.ssl.SSLEngine; import javax.net.ssl.SSLSocket; import javax.net.ssl.SSLSocketFactory; @@ -30,6 +31,11 @@ public class TLSSocketFactory extends SSLSocketFactory { public SSLContext getSSLContext(){ return this.context; } + + public SSLEngine getSSLEngine(){ + return this.context.createSSLEngine(); + } + @Override public String[] getDefaultCipherSuites() { return sSLSocketFactory.getDefaultCipherSuites(); diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/ConversationDecoration.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/ConversationDecoration.java index 27c64355d..8575a1bf6 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/ConversationDecoration.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/ConversationDecoration.java @@ -20,7 +20,6 @@ import android.graphics.Canvas; import android.graphics.drawable.Drawable; import android.support.annotation.NonNull; import android.support.v4.content.ContextCompat; -import android.support.v4.content.res.ResourcesCompat; import android.support.v7.widget.RecyclerView; import android.view.View; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java index 4ec263e83..1b379280f 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java @@ -95,7 +95,6 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn private List mutedAccount; private String instanceType; private String search_peertube, remote_channel_name; - private boolean isFetchingMore; public DisplayStatusFragment(){ } @@ -113,7 +112,6 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn firstTootsLoaded = true; showPinned = false; showReply = false; - isFetchingMore = false; if (bundle != null) { type = (RetrieveFeedsAsyncTask.Type) bundle.get("type"); targetedId = bundle.getString("targetedId", null); @@ -463,11 +461,7 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn if( tmpStatuses.size() < 3) //If new toots are only two lv_status.scrollToPosition(0); else { - if(isFetchingMore) - lv_status.scrollToPosition(position); - else - lv_status.scrollToPosition(position + tmpStatuses.size()); - isFetchingMore = false; + lv_status.scrollToPosition(position + tmpStatuses.size()); } } @@ -491,7 +485,6 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn } swipeRefreshLayout.setRefreshing(false); firstLoad = false; - isFetchingMore = false; } } @@ -734,7 +727,6 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn } public void fetchMore(String max_id){ - isFetchingMore = true; asyncTask = new RetrieveFeedsAsyncTask(context, type, max_id, DisplayStatusFragment.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); }