naprawiono linki z target="_blank", dodano ifv jako submodule

.github/workflows/android.yml

@@ -12,6 +12,8 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
+      with:
+        submodules: 'recursive'
 
     - name: Set up JDK 17
       uses: actions/setup-java@v4

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "app/src/main/assets/ifv"]
+	path = app/src/main/assets/ifv
+	url = https://github.com/banocean/ifv

app/build.gradle

@@ -48,6 +48,7 @@ dependencies {
     implementation libs.androidx.material3
     implementation libs.androidx.coordinatorlayout
     implementation libs.material
+    implementation libs.androidx.browser
     testImplementation libs.junit
     androidTestImplementation libs.androidx.junit
     androidTestImplementation libs.androidx.espresso.core

app/src/main/assets/autoLogin/efeb.js

@@ -7,8 +7,8 @@ function fillLoginForm() {
 	const triedLoggingIn = sessionStorage.getItem('triedLoggingIn');
 
 	browser.storage.local.get().then((result) => {
-		const login = result.Login;
-		const haslo = result.Haslo;
+		const login = result?.Login;
+		const haslo = result?.Haslo;
 
 		if (login !== undefined && haslo !== undefined && triedLoggingIn === null) {
 			loginField.value = login;

app/src/main/assets/autoLogin/loading.js

@@ -1,11 +1,57 @@
-const loaderHolder = document.createElement('div');
-loaderHolder.className = 'loader-holder';
-document.body.appendChild(loaderHolder);
+showLoader();
 
-const loader = document.createElement('div');
-loader.className = 'loader';
-loaderHolder.appendChild(loader);
+function showLoader() {
+	const style = document.createElement('style');
+	style.textContent = `
+    .loader {
+    	width: 45px;
+    	aspect-ratio: 1;
+    	--c: no-repeat linear-gradient(#ca2c2a 0 0);
+    	background: var(--c) 0% 50%, var(--c) 50% 50%, var(--c) 100% 50%;
+    	background-size: 20% 100%;
+    	animation: l1 1s infinite linear;
+    }
+    .loader-holder {
+        position: fixed;
+        top: 0;
+        left: 0;
+        width: 100%;
+        height: 100%;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        background: rgba(0, 0, 0, 0.7);
+        z-index: 9999;
+    }
+    @keyframes l1 {
+    	0% {
+    		background-size: 20% 100%, 20% 100%, 20% 100%;
+    	}
+    	33% {
+    		background-size: 20% 10%, 20% 100%, 20% 100%;
+    	}
+    	50% {
+    		background-size: 20% 100%, 20% 10%, 20% 100%;
+    	}
+    	66% {
+    		background-size: 20% 100%, 20% 100%, 20% 10%;
+    	}
+    	100% {
+    		background-size: 20% 100%, 20% 100%, 20% 100%;
+    	}
+    }
+`;
+	(document.head || document.documentElement).appendChild(style);
 
-addEventListener('load', () => {
-    document.body.removeChild(loaderHolder);
-})
+	const loaderHolder = document.createElement('div');
+	loaderHolder.className = 'loader-holder';
+	const loader = document.createElement('div');
+	loader.className = 'loader';
+	loaderHolder.appendChild(loader);
+
+	(document.body || document.documentElement).appendChild(loaderHolder);
+
+	window.addEventListener('load', () => {
+		loaderHolder.remove();
+	});
+}

app/src/main/assets/autoLogin/manifest.json

@@ -21,33 +21,32 @@
 	"content_scripts": [
 		{
 			"js": ["loading.js"],
-			"css": ["loader.css"],
 			"matches": [
 				"*://eduvulcan.pl/logowanie",
 				"*://eduvulcan.pl/",
-				"*://dziennik-uczen.vulcan.net.pl/*/LoginEndpoint.aspx"
+				"*://dziennik-logowanie.vulcan.net.pl/*/Account/Logon*"
 			],
-			"run_at": "document_end"
+			"run_at": "document_start"
 		},
 		{
 			"js": ["prometeusz.js"],
-			"matches": [
-				"*://eduvulcan.pl/logowanie",
-				"*://eduvulcan.pl/"
-			],
+			"matches": ["*://eduvulcan.pl/logowanie", "*://eduvulcan.pl/"],
 			"run_at": "document_end"
 		},
 		{
 			"js": ["efeb.js"],
-			"matches": ["*://dziennik-uczen.vulcan.net.pl/*/LoginEndpoint.aspx"],
+			"matches": [
+				"*://dziennik-logowanie.vulcan.net.pl/*/Account/Logon*"
+			],
 			"run_at": "document_end"
 		},
 		{
 			"js": ["logout.js"],
 			"matches": [
 				"*://eduvulcan.pl/wylogowanie",
 				"*://dziennik-uczen.vulcan.net.pl/*/nie-wiem-jaki-endpoint"
-			]
+			],
+			"run_at": "document_start"
 		}
 	]
 }

app/src/main/assets/autoLogin/prometeusz.js

@@ -11,14 +11,14 @@ function fillLoginForm() {
 	const triedLoggingIn = sessionStorage.getItem('triedLoggingIn');
 
 	browser.storage.local.get().then((result) => {
-		const alias = result.Alias;
-		const password = result.Password;
+		const alias = result?.Alias;
+		const password = result?.Password;
 
 		if (alias !== undefined && password !== undefined && triedLoggingIn === null) {
 			aliasField.value = alias;
 			passwordField.value = password;
 			loginButton.click();
-			sessionStorage.setItem("triedLoggingIn", "1" );
+			sessionStorage.setItem("triedLoggingIn", "1");
 		} else {
 			if (triedLoggingIn === "1") {
 				document.querySelectorAll('.message-error').forEach(e => {