SSL certificate self-signed

.github/workflows/android.yml

@@ -31,3 +31,10 @@ jobs:
 
       - name: Build
         run: ./gradlew build
+      - name: Assemble Debug APK
+        run: ./gradlew assembleDebug
+      - name: Upload Debug APK
+        uses: actions/upload-artifact@v4
+        with:
+          name: app-debug-apk
+          path: app/build/outputs/apk/debug/*.apk

.github/workflows/gradle-wrapper-validation.yml

@@ -9,5 +9,5 @@ jobs:
     name: "Validation"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: gradle/wrapper-validation-action@v1
+      - uses: actions/checkout@v4
+      - uses: gradle/actions/wrapper-validation@v4

app/build.gradle

@@ -65,6 +65,7 @@ dependencies {
     implementation 'com.google.android.material:material:1.12.0'
     implementation 'org.greenrobot:eventbus:3.3.1'
     implementation 'org.greenrobot:greendao:3.3.0'
+    implementation 'com.github.bumptech.glide:okhttp3-integration:4.16.0'
     annotationProcessor 'org.greenrobot:eventbus-annotation-processor:3.3.1'
     implementation 'com.squareup.okhttp3:okhttp:4.12.0'
     implementation 'com.squareup.okhttp3:okhttp-urlconnection:4.12.0'

app/src/main/java/fr/gaulupeau/apps/Poche/data/ListAdapter.java

@@ -2,6 +2,8 @@
 
 import android.app.Activity;
 import android.content.Context;
+import android.net.Uri;
+import android.util.Log;
 import android.view.ContextMenu;
 import android.view.LayoutInflater;
 import android.view.MenuInflater;
@@ -14,8 +16,12 @@
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
 import java.util.List;
+import java.util.Locale;
 
+import fr.gaulupeau.apps.InThePoche.BuildConfig;
 import fr.gaulupeau.apps.InThePoche.R;
 import fr.gaulupeau.apps.Poche.data.dao.entities.Article;
 import fr.gaulupeau.apps.Poche.ui.ArticleActionsHelper;
@@ -24,6 +30,8 @@
 import static fr.gaulupeau.apps.Poche.data.ListTypes.LIST_TYPE_FAVORITES;
 import static fr.gaulupeau.apps.Poche.data.ListTypes.LIST_TYPE_UNREAD;
 
+import com.bumptech.glide.Glide;
+
 public class ListAdapter extends RecyclerView.Adapter<ListAdapter.ViewHolder> {
 
     public interface OnItemClickListener {
@@ -83,6 +91,8 @@ public class ViewHolder extends RecyclerView.ViewHolder
         ImageView favourite;
         ImageView read;
         TextView readingTime;
+        ImageView previewPicture;
+        TextView publishedAt;
 
         ViewHolder(View itemView, OnItemClickListener listener) {
             super(itemView);
@@ -93,6 +103,9 @@ public class ViewHolder extends RecyclerView.ViewHolder
             favourite = itemView.findViewById(R.id.favourite);
             read = itemView.findViewById(R.id.read);
             readingTime = itemView.findViewById(R.id.estimatedReadingTime);
+            previewPicture = itemView.findViewById(R.id.previewPicture);
+            publishedAt= itemView.findViewById(R.id.publishedAt);
+
 
             itemView.setOnClickListener(this);
             itemView.setOnCreateContextMenuListener(this);
@@ -104,6 +117,31 @@ void bind(Article article) {
             title.setText(article.getTitle());
             url.setText(article.getDomain());
 
+            previewPicture.setVisibility(View.GONE);
+            if(settings.getArticleListShowPreviewPicture()) {
+                // set picture height from settings
+                if (settings.getArticleListPreviewPictureHeight() > 0) {
+                    previewPicture.getLayoutParams().height = settings.getArticleListPreviewPictureHeight();
+                }
+
+                previewPicture.setVisibility(View.GONE);
+                if (article.getPreviewPictureURL() != null && !article.getPreviewPictureURL().isEmpty()) {
+                    previewPicture.setVisibility(View.VISIBLE);
+                    Glide
+                            .with(context)
+                            .load(article.getPreviewPictureURL())
+                            .centerCrop()
+                            .into(previewPicture);
+                }
+            }
+
+            // show author if available in url TextView
+            if(settings.getArticleListShowAuthor()) {
+                if (article.getAuthors() != null && !article.getAuthors().isEmpty()) {
+                    url.setText(url.getText() + " (" + article.getAuthors() + ")");
+                }
+            }
+
             boolean showFavourite = false;
             boolean showRead = false;
             switch (listType) {
@@ -125,6 +163,28 @@ void bind(Article article) {
             read.setVisibility(showRead ? View.VISIBLE : View.GONE);
             readingTime.setText(context.getString(R.string.listItem_estimatedReadingTime,
                     article.getEstimatedReadingTime(settings.getReadingSpeed())));
+
+            // show date article in readingTime if active in settings
+            publishedAt.setVisibility(View.GONE);
+            if(settings.getArticleListShowPublishedAt()) {
+                java.util.Date displayDate=null;
+                if (article.getPublishedAt() != null) {
+                    displayDate=article.getPublishedAt();
+                }
+                else if(article.getCreationDate()!=null){
+                    displayDate=article.getCreationDate();
+                }
+
+                if(displayDate!=null) {
+                    publishedAt.setVisibility(View.VISIBLE);
+                    var stringBuilder = new StringBuilder();
+                    stringBuilder.append(android.text.format.DateFormat.getDateFormat(context).format(displayDate));
+                    stringBuilder.append(' ');
+                    stringBuilder.append(android.text.format.DateFormat.getTimeFormat(context).format(displayDate));
+                    publishedAt.setText(stringBuilder.toString());
+                }
+            }
+
         }
 
         @Override

app/src/main/java/fr/gaulupeau/apps/Poche/data/Settings.java

@@ -239,6 +239,54 @@ public void setStringSet(int keyResourceID, Set<String> values) {
         setStringSet(context.getString(keyResourceID), values);
     }
 
+    public boolean getSelfSignedTrust(){
+        return getBoolean(R.string.pref_key_connection_selfsignedtrust,false);
+    }
+
+    public void setSelfSignedTrust(boolean selfSignedTrust){
+        setBoolean(R.string.pref_key_connection_selfsignedtrust,selfSignedTrust);
+    }
+
+    public boolean getArticleListShowPreviewPicture(){
+        return getBoolean(R.string.pref_key_ui_articleList_showPreviewPicture,false);
+    }
+
+    public void setArticleListShowPreviewPicture(boolean articleListShowPreviewPicture){
+        setBoolean(R.string.pref_key_ui_articleList_showPreviewPicture,articleListShowPreviewPicture);
+    }
+
+    public int getArticleListPreviewPictureHeight(){
+        return getInt(R.string.pref_key_ui_articleList_previewPictureHeight,500);
+    }
+
+    public void setArticleListPreviewPictureHeight(int articleListPreviewPictureHeight){
+        setInt(R.string.pref_key_ui_articleList_previewPictureHeight,articleListPreviewPictureHeight);
+    }
+
+    public boolean getArticleListShowAuthor(){
+        return getBoolean(R.string.pref_key_ui_articleList_showAuthor,false);
+    }
+
+    public void setArticleListShowAuthor(boolean articleListShowAuthor){
+        setBoolean(R.string.pref_key_ui_articleList_showAuthor,articleListShowAuthor);
+    }
+
+    public boolean getArticleListShowPublishedAt(){
+        return getBoolean(R.string.pref_key_ui_articleList_showPublishedAt,false);
+    }
+
+    public void setArticleListShowPublishedAt(boolean articleListPublishedAt){
+        setBoolean(R.string.pref_key_ui_articleList_showPublishedAt,articleListPublishedAt);
+    }
+
+    public boolean getArticleListShowDivider() {
+        return getBoolean(R.string.pref_key_ui_articleList_showDivider,false);
+    }
+
+    public void setArticleListShowDivider(boolean articleListShowDivider) {
+        setBoolean(R.string.pref_key_ui_articleList_showDivider,articleListShowDivider);
+    }
+
     public String getUrl() {
         return getString(R.string.pref_key_connection_url);
     }
@@ -401,9 +449,9 @@ public Sortable.SortOrder getListSortOrder() {
         String sortOrderParam = getString(R.string.pref_key_ui_lists_sortOrder);
 
         Sortable.SortOrder sortOrder = null;
-        if(sortOrderParam != null) {
+        if(sortOrderParam != null && !sortOrderParam.isEmpty()) {
             try {
-                sortOrder = Sortable.SortOrder.valueOf(sortOrderParam);
+                    sortOrder = Sortable.SortOrder.valueOf(sortOrderParam);
             } catch(IllegalArgumentException ignored) {}
         }
 

app/src/main/java/fr/gaulupeau/apps/Poche/network/SelfSignedTrustManager.java

@@ -0,0 +1,40 @@
+package fr.gaulupeau.apps.Poche.network;
+
+import javax.net.ssl.*;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+
+public class SelfSignedTrustManager implements X509TrustManager {
+    @Override
+    public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException {
+        // Optionnel : implémenter selon tes besoins
+    }
+
+    @Override
+    public void checkServerTrusted(X509Certificate[] chain, String authType) throws CertificateException {
+        if (chain == null || chain.length == 0) throw new IllegalArgumentException("Empty or null certificate chain");
+        X509Certificate cert = chain[0];
+        // Vérifie si le certificat est auto-signé
+        if (isSelfSigned(cert)) {
+           return;
+        }
+        // accepter le certificat s'il est valide
+        cert.checkValidity();
+    }
+
+    @Override
+    public X509Certificate[] getAcceptedIssuers() {
+        return new X509Certificate[0];
+    }
+
+    // Vérifie si le certificat est auto-signé
+    private boolean isSelfSigned(X509Certificate cert) {
+        try {
+            // Un certificat est auto-signé si l’émetteur et le sujet sont identiques et si la signature est valide avec sa propre clé publique
+            cert.verify(cert.getPublicKey());
+            return cert.getSubjectX500Principal().equals(cert.getIssuerX500Principal());
+        } catch (Exception e) {
+            return false;
+        }
+    }
+}

app/src/main/java/fr/gaulupeau/apps/Poche/network/WallabagConnection.java

@@ -6,16 +6,24 @@
 import android.text.TextUtils;
 import android.util.Log;
 
+import androidx.annotation.NonNull;
+
 import com.facebook.stetho.okhttp3.StethoInterceptor;
 
 import org.conscrypt.Conscrypt;
 
 import java.io.IOException;
 import java.net.CookieManager;
 import java.net.CookiePolicy;
+import java.security.KeyManagementException;
 import java.security.Security;
 import java.util.concurrent.TimeUnit;
 
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSocketFactory;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
+
 import fr.gaulupeau.apps.InThePoche.BuildConfig;
 import fr.gaulupeau.apps.Poche.App;
 import fr.gaulupeau.apps.Poche.data.Settings;
@@ -160,6 +168,23 @@ private static OkHttpClient.Builder getClientBuilder(boolean addCookieManager) {
             b.addNetworkInterceptor(new StethoInterceptor());
         }
 
+        if(App.getSettings().getSelfSignedTrust()) {
+            // validate ssl
+            try {
+                TrustManager[] trustManagers = new TrustManager[]{new SelfSignedTrustManager()};
+                SSLContext sslContext = SSLContext.getInstance("TLS");
+
+                sslContext.init(null, trustManagers, new java.security.SecureRandom());
+
+                SSLSocketFactory sslSocketFactory = sslContext.getSocketFactory();
+
+                b.sslSocketFactory(sslSocketFactory, (X509TrustManager) trustManagers[0]);
+                b.hostnameVerifier((hostname, session) -> true);
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        }
+
         return b;
     }
 

app/src/main/java/fr/gaulupeau/apps/Poche/ui/ArticleListFragment.java

@@ -236,13 +236,19 @@ private QueryBuilder<Article> getQueryBuilder() {
 
         switch (sortOrder) {
             case ASC:
+            case CreationDateASC:
                 qb.orderAsc(ArticleDao.Properties.CreationDate, ArticleDao.Properties.ArticleId);
                 break;
-
             case DESC:
+            case CreationDateDESC:
                 qb.orderDesc(ArticleDao.Properties.CreationDate, ArticleDao.Properties.ArticleId);
                 break;
-
+            case EstimatedReadingTimeASC:
+                qb.orderAsc(ArticleDao.Properties.EstimatedReadingTime, ArticleDao.Properties.ArticleId);
+                break;
+            case EstimatedReadingTimeDESC:
+                qb.orderDesc(ArticleDao.Properties.EstimatedReadingTime, ArticleDao.Properties.ArticleId);
+                break;
             default:
                 throw new IllegalStateException("Sort order not implemented: " + sortOrder);
         }