diff --git a/.kotlin/errors/errors-1740058325743.log b/.kotlin/errors/errors-1740058325743.log
new file mode 100644
index 0000000..e7ee516
--- /dev/null
+++ b/.kotlin/errors/errors-1740058325743.log
@@ -0,0 +1,82 @@
+kotlin version: 2.0.21
+error message: Daemon compilation failed: null
+java.lang.Exception
+ at org.jetbrains.kotlin.daemon.common.CompileService$CallResult$Error.get(CompileService.kt:69)
+ at org.jetbrains.kotlin.daemon.common.CompileService$CallResult$Error.get(CompileService.kt:65)
+ at org.jetbrains.kotlin.compilerRunner.GradleKotlinCompilerWork.compileWithDaemon(GradleKotlinCompilerWork.kt:240)
+ at org.jetbrains.kotlin.compilerRunner.GradleKotlinCompilerWork.compileWithDaemonOrFallbackImpl(GradleKotlinCompilerWork.kt:159)
+ at org.jetbrains.kotlin.compilerRunner.GradleKotlinCompilerWork.run(GradleKotlinCompilerWork.kt:111)
+ at org.jetbrains.kotlin.compilerRunner.GradleCompilerRunnerWithWorkers$GradleKotlinCompilerWorkAction.execute(GradleCompilerRunnerWithWorkers.kt:76)
+ at org.gradle.workers.internal.DefaultWorkerServer.execute(DefaultWorkerServer.java:63)
+ at org.gradle.workers.internal.NoIsolationWorkerFactory$1$1.create(NoIsolationWorkerFactory.java:66)
+ at org.gradle.workers.internal.NoIsolationWorkerFactory$1$1.create(NoIsolationWorkerFactory.java:62)
+ at org.gradle.internal.classloader.ClassLoaderUtils.executeInClassloader(ClassLoaderUtils.java:100)
+ at org.gradle.workers.internal.NoIsolationWorkerFactory$1.lambda$execute$0(NoIsolationWorkerFactory.java:62)
+ at org.gradle.workers.internal.AbstractWorker$1.call(AbstractWorker.java:44)
+ at org.gradle.workers.internal.AbstractWorker$1.call(AbstractWorker.java:41)
+ at org.gradle.internal.operations.DefaultBuildOperationRunner$CallableBuildOperationWorker.execute(DefaultBuildOperationRunner.java:209)
+ at org.gradle.internal.operations.DefaultBuildOperationRunner$CallableBuildOperationWorker.execute(DefaultBuildOperationRunner.java:204)
+ at org.gradle.internal.operations.DefaultBuildOperationRunner$2.execute(DefaultBuildOperationRunner.java:66)
+ at org.gradle.internal.operations.DefaultBuildOperationRunner$2.execute(DefaultBuildOperationRunner.java:59)
+ at org.gradle.internal.operations.DefaultBuildOperationRunner.execute(DefaultBuildOperationRunner.java:166)
+ at org.gradle.internal.operations.DefaultBuildOperationRunner.execute(DefaultBuildOperationRunner.java:59)
+ at org.gradle.internal.operations.DefaultBuildOperationRunner.call(DefaultBuildOperationRunner.java:53)
+ at org.gradle.workers.internal.AbstractWorker.executeWrappedInBuildOperation(AbstractWorker.java:41)
+ at org.gradle.workers.internal.NoIsolationWorkerFactory$1.execute(NoIsolationWorkerFactory.java:59)
+ at org.gradle.workers.internal.DefaultWorkerExecutor.lambda$submitWork$0(DefaultWorkerExecutor.java:174)
+ at java.base/java.util.concurrent.FutureTask.run(Unknown Source)
+ at org.gradle.internal.work.DefaultConditionalExecutionQueue$ExecutionRunner.runExecution(DefaultConditionalExecutionQueue.java:195)
+ at org.gradle.internal.work.DefaultConditionalExecutionQueue$ExecutionRunner.access$700(DefaultConditionalExecutionQueue.java:128)
+ at org.gradle.internal.work.DefaultConditionalExecutionQueue$ExecutionRunner$1.run(DefaultConditionalExecutionQueue.java:170)
+ at org.gradle.internal.Factories$1.create(Factories.java:31)
+ at org.gradle.internal.work.DefaultWorkerLeaseService.withLocks(DefaultWorkerLeaseService.java:267)
+ at org.gradle.internal.work.DefaultWorkerLeaseService.runAsWorkerThread(DefaultWorkerLeaseService.java:131)
+ at org.gradle.internal.work.DefaultWorkerLeaseService.runAsWorkerThread(DefaultWorkerLeaseService.java:136)
+ at org.gradle.internal.work.DefaultConditionalExecutionQueue$ExecutionRunner.runBatch(DefaultConditionalExecutionQueue.java:165)
+ at org.gradle.internal.work.DefaultConditionalExecutionQueue$ExecutionRunner.run(DefaultConditionalExecutionQueue.java:134)
+ at java.base/java.util.concurrent.Executors$RunnableAdapter.call(Unknown Source)
+ at java.base/java.util.concurrent.FutureTask.run(Unknown Source)
+ at org.gradle.internal.concurrent.ExecutorPolicy$CatchAndRecordFailures.onExecute(ExecutorPolicy.java:64)
+ at org.gradle.internal.concurrent.AbstractManagedExecutor$1.run(AbstractManagedExecutor.java:48)
+ at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(Unknown Source)
+ at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(Unknown Source)
+ at java.base/java.lang.Thread.run(Unknown Source)
+Caused by: java.nio.file.DirectoryNotEmptyException: C:\Users\User\AppData\Local\Temp\kotlin-backups4918563675494505777
+ at java.base/sun.nio.fs.WindowsFileSystemProvider.implDelete(Unknown Source)
+ at java.base/sun.nio.fs.AbstractFileSystemProvider.delete(Unknown Source)
+ at java.base/java.nio.file.Files.delete(Unknown Source)
+ at org.jetbrains.kotlin.incremental.RecoverableCompilationTransaction$cleanupStash$2$1$1.invoke(CompilationTransaction.kt:244)
+ at org.jetbrains.kotlin.incremental.RecoverableCompilationTransaction$cleanupStash$2$1$1.invoke(CompilationTransaction.kt:244)
+ at org.jetbrains.kotlin.incremental.RecoverableCompilationTransaction.cleanupStash$lambda$11$lambda$10$lambda$9(CompilationTransaction.kt:244)
+ at java.base/java.util.stream.ForEachOps$ForEachOp$OfRef.accept(Unknown Source)
+ at java.base/java.util.ArrayList.forEach(Unknown Source)
+ at java.base/java.util.stream.SortedOps$RefSortingSink.end(Unknown Source)
+ at java.base/java.util.stream.Sink$ChainedReference.end(Unknown Source)
+ at java.base/java.util.stream.AbstractPipeline.copyInto(Unknown Source)
+ at java.base/java.util.stream.AbstractPipeline.wrapAndCopyInto(Unknown Source)
+ at java.base/java.util.stream.ForEachOps$ForEachOp.evaluateSequential(Unknown Source)
+ at java.base/java.util.stream.ForEachOps$ForEachOp$OfRef.evaluateSequential(Unknown Source)
+ at java.base/java.util.stream.AbstractPipeline.evaluate(Unknown Source)
+ at java.base/java.util.stream.ReferencePipeline.forEach(Unknown Source)
+ at org.jetbrains.kotlin.incremental.RecoverableCompilationTransaction.cleanupStash(CompilationTransaction.kt:244)
+ at org.jetbrains.kotlin.incremental.RecoverableCompilationTransaction.close(CompilationTransaction.kt:254)
+ at org.jetbrains.kotlin.incremental.IncrementalCompilerRunner.tryCompileIncrementally(IncrementalCompilerRunner.kt:747)
+ at org.jetbrains.kotlin.incremental.IncrementalCompilerRunner.compile(IncrementalCompilerRunner.kt:120)
+ at org.jetbrains.kotlin.daemon.CompileServiceImplBase.execIncrementalCompiler(CompileServiceImpl.kt:675)
+ at org.jetbrains.kotlin.daemon.CompileServiceImplBase.access$execIncrementalCompiler(CompileServiceImpl.kt:92)
+ at org.jetbrains.kotlin.daemon.CompileServiceImpl.compile(CompileServiceImpl.kt:1660)
+ at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(Unknown Source)
+ at java.base/java.lang.reflect.Method.invoke(Unknown Source)
+ at java.rmi/sun.rmi.server.UnicastServerRef.dispatch(Unknown Source)
+ at java.rmi/sun.rmi.transport.Transport$1.run(Unknown Source)
+ at java.rmi/sun.rmi.transport.Transport$1.run(Unknown Source)
+ at java.base/java.security.AccessController.doPrivileged(Unknown Source)
+ at java.rmi/sun.rmi.transport.Transport.serviceCall(Unknown Source)
+ at java.rmi/sun.rmi.transport.tcp.TCPTransport.handleMessages(Unknown Source)
+ at java.rmi/sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.run0(Unknown Source)
+ at java.rmi/sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.lambda$run$0(Unknown Source)
+ at java.base/java.security.AccessController.doPrivileged(Unknown Source)
+ at java.rmi/sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.run(Unknown Source)
+ ... 3 more
+
+
diff --git a/app/Releases/app-release.apk b/app/Releases/app-release.apk
new file mode 100644
index 0000000..5656603
Binary files /dev/null and b/app/Releases/app-release.apk differ
diff --git a/app/src/main/java/ru/myitschool/work/core/Constants.kt b/app/src/main/java/ru/myitschool/work/core/Constants.kt
index 8314f72..33ce231 100644
--- a/app/src/main/java/ru/myitschool/work/core/Constants.kt
+++ b/app/src/main/java/ru/myitschool/work/core/Constants.kt
@@ -1,5 +1,5 @@
package ru.myitschool.work.core
-// БЕРИТЕ И ИЗМЕНЯЙТЕ ХОСТ ТОЛЬКО ЗДЕСЬ И НЕ БЕРИТЕ ИЗ ДРУГИХ МЕСТ. ФАЙЛ ПЕРЕМЕЩАТЬ НЕЛЬЗЯ
+
object Constants {
- const val SERVER_ADDRESS = "http://192.168.56.1"
+ const val SERVER_ADDRESS = "http://192.168.56.1:80"
}
\ No newline at end of file
diff --git a/app/src/main/java/ru/myitschool/work/ui/login/LoginFragment.java b/app/src/main/java/ru/myitschool/work/ui/login/LoginFragment.java
index a6f1187..e33a697 100644
--- a/app/src/main/java/ru/myitschool/work/ui/login/LoginFragment.java
+++ b/app/src/main/java/ru/myitschool/work/ui/login/LoginFragment.java
@@ -27,8 +27,6 @@ public class LoginFragment extends Fragment {
private static final String SHARED_PREFERENCES_LOGIN_PREFERENCES = "l01";
private static final String SHARED_PREFERENCES_LOGIN_STRING = "l02";
- private String log = "", pas = "";
-
private FragmentLoginBinding binding;
private LoginViewModel viewModel;
@@ -60,8 +58,7 @@ public class LoginFragment extends Fragment {
@Override
public void afterTextChanged(Editable s) {
- log = s.toString();
- viewModel.onChangeLoginPassword(log, pas);
+ viewModel.onChangeLogin(s.toString());
binding.error.setVisibility(View.GONE);
}
});
@@ -73,8 +70,7 @@ public class LoginFragment extends Fragment {
@Override
public void afterTextChanged(Editable s) {
- pas = s.toString();
- viewModel.onChangeLoginPassword(log, pas);
+ viewModel.onChangePassword(s.toString());
binding.error.setVisibility(View.GONE);
}
});
@@ -82,19 +78,13 @@ public class LoginFragment extends Fragment {
binding.login.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- binding.username.setText("");
- binding.password.setText("");
- /*Navigation.findNavController(getView()).navigate(
- R.id.action_login_fragment_to_employee_fragment
- );*/
+ viewModel.startQuery();
binding.error.setVisibility(View.GONE);
}
});
subscribe(viewModel);
- viewModel.onChangeLoginPassword(binding.username.toString(), binding.password.toString());
-
}
private void subscribe(LoginViewModel viewModel) {
diff --git a/app/src/main/java/ru/myitschool/work/ui/login/LoginViewModel.java b/app/src/main/java/ru/myitschool/work/ui/login/LoginViewModel.java
index 54e7e20..9e38f7b 100644
--- a/app/src/main/java/ru/myitschool/work/ui/login/LoginViewModel.java
+++ b/app/src/main/java/ru/myitschool/work/ui/login/LoginViewModel.java
@@ -1,6 +1,7 @@
package ru.myitschool.work.ui.login;
import android.util.Base64;
+import android.util.Log;
import androidx.lifecycle.LiveData;
import androidx.lifecycle.MutableLiveData;
@@ -25,13 +26,20 @@ public class LoginViewModel extends ViewModel {
private final AuthUseCase authUseCase = new AuthUseCase(LoginRepositoryImpl.getInstance());
- private String login;
- private String password;
+ private String login = "";
+ private String password = "";
- public void onChangeLoginPassword(String login, String password) {
+ public void onChangeLogin(String login) {
this.login = login;
+ onChangeButtonState(login, this.password);
+ Log.d("TAG", login);
+ Log.d("TAG", password);
+ }
+ public void onChangePassword(String password) {
this.password = password;
- onChangeButtonState(login, password);
+ onChangeButtonState(this.login, password);
+ Log.d("TAG", login);
+ Log.d("TAG", password);
}
private void onChangeButtonState(String login, String password) {
@@ -50,6 +58,11 @@ public class LoginViewModel extends ViewModel {
} else /*(status.getStatusCode() == 401) */ {
mutableLoginStateLiveData.postValue("Incorrect Login");
}
+ Log.d("TAG", String.valueOf(status.getStatusCode()));
});
+ Log.d("TAG", login);
+ Log.d("TAG", password);
+ Log.d("TAG", "Basic " + Base64.encodeToString((currentLogin + ":" + currentPassword).getBytes(StandardCharsets.UTF_8), Base64.DEFAULT));
+
}
}