NClientV2 2.9.7

* Improved CF token fetch
Dar9586 · Jun 28, 2022 · e4d8d87 · e4d8d87
1 parent 71c94f5
commit e4d8d87
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 8 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -7,9 +7,9 @@ android {
         applicationId "com.dar.nclientv2"
         minSdkVersion 14
         targetSdkVersion 32
-        versionCode 296
+        versionCode 297
         multiDexEnabled true
-        versionName "2.9.6-stable"
+        versionName "2.9.7-stable"
         vectorDrawables.useSupportLibrary true
         proguardFiles 'proguard-rules.pro'
     }

diff --git a/app/src/main/java/com/dar/nclientv2/components/CookieInterceptor.java b/app/src/main/java/com/dar/nclientv2/components/CookieInterceptor.java
@@ -96,8 +96,11 @@ public void intercept() {
             }
             intercepting = true;
             LogUtility.d("Starting intercept CF cookies");
-            if(!manager.endInterceptor())
-                interceptInternal();
+            synchronized (CookieInterceptor.class) {
+                if (!manager.endInterceptor()) {
+                    interceptInternal();
+                }
+            }
             this.manager.onFinish();
             intercepting = false;
         }

diff --git a/app/src/main/java/com/dar/nclientv2/components/views/CFTokenView.java b/app/src/main/java/com/dar/nclientv2/components/views/CFTokenView.java
@@ -1,17 +1,24 @@
 package com.dar.nclientv2.components.views;
 
+import android.content.Context;
+import android.util.AttributeSet;
 import android.view.ViewGroup;
 import android.webkit.WebView;
 import android.widget.Button;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import com.dar.nclientv2.R;
 import com.dar.nclientv2.components.CookieInterceptor;
 
+import java.util.Date;
+
 public class CFTokenView {
 
     private final ViewGroup masterLayout;
-    private WebView webView;
-    private Button button;
+    private final WebView webView;
+    private final Button button;
 
     public CFTokenView(ViewGroup masterLayout) {
         this.masterLayout = masterLayout;
@@ -35,4 +42,39 @@ public void setVisibility(int visible) {
     public void post(Runnable o) {
         masterLayout.post(o);
     }
+
+
+    public static class CFTokenWebView extends WebView{
+        private volatile long lastLoad=0;
+        private static final long MIN_TIME=5000;
+        public CFTokenWebView(@NonNull Context context) {
+            super(context);
+            init();
+        }
+
+        public CFTokenWebView(@NonNull Context context, @Nullable @org.jetbrains.annotations.Nullable AttributeSet attrs) {
+            super(context, attrs);
+            init();
+        }
+
+        public CFTokenWebView(@NonNull Context context, @Nullable @org.jetbrains.annotations.Nullable AttributeSet attrs, int defStyleAttr) {
+            super(context, attrs, defStyleAttr);
+            init();
+        }
+        private void init(){
+
+        }
+
+        @Override
+        public void loadUrl(@NonNull String url) {
+            long actualTime = new Date().getTime();
+            synchronized (this) {
+                if (lastLoad + MIN_TIME <= actualTime) {
+                    lastLoad = actualTime;
+                    super.loadUrl(url);
+                }
+            }
+        }
+    }
+
 }
diff --git a/app/src/main/res/layout/cftoken_layout.xml b/app/src/main/res/layout/cftoken_layout.xml
@@ -15,7 +15,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <WebView
+    <view class="com.dar.nclientv2.components.views.CFTokenView$CFTokenWebView"
         android:id="@+id/webView"
         android:layout_width="0dp"
         android:layout_height="0dp"
@@ -24,5 +24,5 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-    </WebView>
+    </view>
 </androidx.constraintlayout.widget.ConstraintLayout>