|
|
@@ -10,6 +10,7 @@ import android.os.Build;
|
|
|
import android.os.Bundle;
|
|
|
import android.os.Handler;
|
|
|
import android.os.Looper;
|
|
|
+import android.util.Log;
|
|
|
import android.view.Menu;
|
|
|
import android.view.MenuItem;
|
|
|
import android.view.View;
|
|
|
@@ -31,9 +32,13 @@ import androidx.recyclerview.widget.RecyclerView;
|
|
|
|
|
|
import com.bumptech.glide.RequestManager;
|
|
|
import com.dar.nbook.adapters.ListAdapter;
|
|
|
+import com.dar.nbook.api.HttpCallback;
|
|
|
+import com.dar.nbook.api.HttpError;
|
|
|
import com.dar.nbook.api.InspectorV3;
|
|
|
+import com.dar.nbook.api.HttpClient;
|
|
|
import com.dar.nbook.api.components.Gallery;
|
|
|
import com.dar.nbook.api.components.GenericGallery;
|
|
|
+import com.dar.nbook.api.components.NUser;
|
|
|
import com.dar.nbook.api.components.Ranges;
|
|
|
import com.dar.nbook.api.components.Tag;
|
|
|
import com.dar.nbook.api.enums.ApiRequestType;
|
|
|
@@ -42,6 +47,9 @@ import com.dar.nbook.api.enums.SortType;
|
|
|
import com.dar.nbook.api.enums.SpecialTagIds;
|
|
|
import com.dar.nbook.api.enums.TagStatus;
|
|
|
import com.dar.nbook.api.enums.TagType;
|
|
|
+import com.dar.nbook.api.request.UserLogin;
|
|
|
+import com.dar.nbook.api.request.UserRegister;
|
|
|
+import com.dar.nbook.api.response.LoginResponse;
|
|
|
import com.dar.nbook.async.ScrapeTags;
|
|
|
import com.dar.nbook.async.VersionChecker;
|
|
|
import com.dar.nbook.async.database.Queries;
|
|
|
@@ -69,6 +77,9 @@ import java.util.Locale;
|
|
|
import java.util.Objects;
|
|
|
|
|
|
import okhttp3.Cookie;
|
|
|
+import retrofit2.Call;
|
|
|
+import retrofit2.Callback;
|
|
|
+import retrofit2.Response;
|
|
|
|
|
|
public class MainActivity extends BaseActivity
|
|
|
implements NavigationView.OnNavigationItemSelectedListener {
|
|
|
@@ -186,6 +197,31 @@ public class MainActivity extends BaseActivity
|
|
|
.centerCrop()
|
|
|
.placeholder(R.drawable.ic_logo)
|
|
|
.into(ivAd);
|
|
|
+
|
|
|
+ HttpClient.request(HttpClient.getApiService().register(new UserRegister("asdf1", "123456", null)), new HttpCallback<NUser>() {
|
|
|
+ @Override
|
|
|
+ public void onSuccess(NUser data) {
|
|
|
+ LogUtility.d("Register success");
|
|
|
+ HttpClient.request(HttpClient.getApiService().login(new UserLogin("asdf1", "123456")), new HttpCallback<LoginResponse>() {
|
|
|
+ @Override
|
|
|
+ public void onSuccess(LoginResponse data) {
|
|
|
+ LogUtility.d("Login success");
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public void onFailure(HttpError<LoginResponse> error) {
|
|
|
+ LogUtility.e("Login failed");
|
|
|
+ }
|
|
|
+ });
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public void onFailure(HttpError<NUser> error) {
|
|
|
+ LogUtility.e("Register failed");
|
|
|
+ }
|
|
|
+ });
|
|
|
+
|
|
|
+
|
|
|
}
|
|
|
|
|
|
private void manageDrawer() {
|
|
|
@@ -769,7 +805,7 @@ public class MainActivity extends BaseActivity
|
|
|
if (Login.isLogged())
|
|
|
showLogoutForm();
|
|
|
else {
|
|
|
- intent = new Intent(this, LoginActivity.class);
|
|
|
+ intent = new Intent(this, BLoginActivity.class);
|
|
|
startActivity(intent);
|
|
|
}
|
|
|
} else if (item.getItemId() == R.id.random) {
|