From 088b7e3f373357c9aa02af5b9cfdf8e6bd64ac40 Mon Sep 17 00:00:00 2001
From: hwf453 <hwf453@163.com>
Date: Tue, 17 Oct 2023 17:38:07 +0800
Subject: [PATCH] 2.2.5

---
 .../zhdcoa/utils/NoProgresshttpUtils.java     | 138 ------------------
 app/src/main/res/raw/domain.cer               | Bin 0 -> 933 bytes
 2 files changed, 138 deletions(-)
 delete mode 100644 app/src/main/java/com/rehome/zhdcoa/utils/NoProgresshttpUtils.java
 create mode 100644 app/src/main/res/raw/domain.cer

diff --git a/app/src/main/java/com/rehome/zhdcoa/utils/NoProgresshttpUtils.java b/app/src/main/java/com/rehome/zhdcoa/utils/NoProgresshttpUtils.java
deleted file mode 100644
index 52b97e1..0000000
--- a/app/src/main/java/com/rehome/zhdcoa/utils/NoProgresshttpUtils.java
+++ /dev/null
@@ -1,138 +0,0 @@
-package com.rehome.zhdcoa.utils;
-
-
-import android.app.Activity;
-import android.content.Context;
-import android.text.TextUtils;
-import android.util.Log;
-
-import com.google.gson.Gson;
-import com.rehome.zhdcoa.App;
-import com.rehome.zhdcoa.BuildConfig;
-import com.rehome.zhdcoa.R;
-import com.yolanda.nohttp.NoHttp;
-import com.yolanda.nohttp.download.DownloadQueue;
-import com.yolanda.nohttp.rest.Request;
-import com.yolanda.nohttp.rest.RequestQueue;
-
-import java.security.KeyStore;
-import java.security.SecureRandom;
-import java.security.cert.CertificateFactory;
-
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSocketFactory;
-import javax.net.ssl.TrustManagerFactory;
-
-/**
- * Nohttp工具类
- */
-public class NoProgresshttpUtils {
-
-    private static NoProgresshttpUtils sUtils;
-    private RequestQueue mQueue;
-
-    /**
-     * 下载队列.
-     */
-    private static DownloadQueue downloadQueue;
-
-    private NoProgresshttpUtils() {
-        mQueue = NoHttp.newRequestQueue(8);
-    }
-
-    /**
-     * DCL单例模式  双层锁
-     *
-     * @return
-     */
-    public static NoProgresshttpUtils getInstance() {
-        if (sUtils == null) {
-            synchronized (NohttpUtils.class) {
-                if (sUtils == null) {
-                    sUtils = new NoProgresshttpUtils();
-                }
-            }
-        }
-        return sUtils;
-    }
-
-    /**
-     * 下载队列.
-     */
-    public static DownloadQueue getDownloadInstance() {
-        if (downloadQueue == null)
-            downloadQueue = NoHttp.newDownloadQueue(1);
-        return downloadQueue;
-    }
-
-
-    public <T> void add(int what, Request<T> request, HttpListener<T> callback) {
-        if (App.getInstance().getUserInfo() != null && App.getInstance().getUserInfo().getToken() != null) {
-            String token = App.getInstance().getUserInfo().getToken();
-            String credential = "Bearer " + token;
-            request.addHeader("Authorization", credential);
-            showLog(request.url());
-//            showLog(credential);
-//            showLog(new Gson().toJson(request.headers()));
-        }
-        mQueue.add(what, request, new HttpResponseListenerNoProgress<T>(request, callback));
-    }
-
-    public void showLog(String logText) {
-        if (BuildConfig.LOG_ERROR) {
-            if (TextUtils.isEmpty(logText)) {
-                Log.i("app", "logText is null");
-            } else {
-                Log.i("app", logText);
-            }
-        }
-    }
-
-    /**
-     * 取消这个sign这个标记的所有请求
-     *
-     * @param sign
-     */
-    public void cancelBySign(Object sign) {
-        mQueue.cancelBySign(sign);
-    }
-
-    /**
-     * 取消队列中所有请求
-     */
-    public void cancelAll() {
-        mQueue.cancelAll();
-    }
-
-    /**
-     * 退出App停止所有请求
-     */
-    public void stopAll() {
-        mQueue.stop();
-    }
-
-    public static SSLSocketFactory getSSLSocketFactory(Context context) {
-        try {
-            CertificateFactory certificateFactory = CertificateFactory.getInstance("X.509");
-            KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
-            keyStore.load(null);
-            String certificateAlias = Integer.toString(0);
-            keyStore.setCertificateEntry(certificateAlias, certificateFactory.
-                    generateCertificate(context.getResources().openRawResource(R.raw.ca1)));
-            SSLContext sslContext = SSLContext.getInstance("TLS");
-            final TrustManagerFactory trustManagerFactory =
-                    TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
-            trustManagerFactory.init(keyStore);
-            sslContext.init
-                    (
-                            null,
-                            trustManagerFactory.getTrustManagers(),
-                            new SecureRandom()
-                    );
-            return sslContext.getSocketFactory();
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
-        return null;
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/res/raw/domain.cer b/app/src/main/res/raw/domain.cer
new file mode 100644
index 0000000000000000000000000000000000000000..23701117914b0bd5d6f7f7e5dc0567885ebb0ae3
GIT binary patch
literal 933
zcmXqLVqR#_#MH?o!uWJ@ycEBE_2s+YmR3Et`<B|&_t}7#jZ>@5qwPB{BO^B}gF$1r
zA-4f18*?ZNn=q5JpP`U}0EolE!|7g{n3tZCpO<dP57Yz{W9MOu$|%i9%!CPW@vs%8
zX5{Cl!UVYC0%8UtAT7*1yhetWdWOb^dWM#!dd7yb2GVf*IT^+HGRo6TOpP22&5ZSu
z^K%Up#CeU34Gj#<4a^NK42+^A_>ByWj14S-7$Pvp+}p&cgdCuZtPIRejQk7+O^jSj
zO^l2T8(8xtG{0T!2=}<Ltt`aE&!SGJMR4ca9gYiw51tNPR~4U8`bF}?^=}tDPh4hZ
zWSt;#sOIB7`%V8pG5u@QVN7~-QM6n>s4x28%#Ka39b0zucr~{*#4tx5?{S<RqNyck
z`M=8Gg>+-nF^093JMIPhyo~*Lc1IdR*<qg?;e_|*mfboTU&Q^U*>!|Xs<?gOYl-EP
zUp1m(u2H|E^wl{`9R9BEk#=y8coSB(MQ-M+E&JM|(x(V3RZJ+@F8Q;&Bz3-&V)Xa@
z;`_9U?#!y3K2>U7=bBkY-#IThu%sWkpLf&cL~6&ce~o3vONA}HAKFwXe{Pg7lAK`K
zX7j-|XI;QPujsp`Ow5c7jL0DbOme^wVq{P+(O(s~SXR?hbiRp=>l*E+D&I8{9e=fP
z3e_^WURq_GGHsFVi`!<Ov>pq`WEx&Cyf=UQ`a}PDSIPT%FFS4FckXY{W5-*%i~eu>
z9m`aBf4)pW8qW{2m}ceLjP&Hpo70{+Gc+A2GJF2WsPnYDw4T$4VCP_;|4-SCSKge?
ztIT|>wPcETSj<b_rCJ@f=O&soi5-1lzIuHHS0Bg!y)ula*st(6tImpDyM;+oRlf43
zj>}aS|7ENvy=Tt-;G+JmZF^XK#gk*6xnHvHCr5FV`rEDZQ)!sAc=gk;9jeR<^HuFd
o9`;-f))Y9p%xZhWx|!>Z4Z}D8*nH5h`MON5>#pStTLQiT02zNwWdHyG

literal 0
HcmV?d00001