tenkuma/jamfish
tenkuma/jamfish
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove servers from database

Browse source
This commit is contained in:
dkanada 2021-04-14 18:19:19 +09:00
commit 8a73fcf6a4
7 changed files with 25 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/src/main/java/com/dkanada/gramophone/activities/LoginActivity.java
View file

@ -14,7 +14,6 @@ import com.dkanada.gramophone.App;
import com.dkanada.gramophone.R;
import com.dkanada.gramophone.databinding.ActivityLoginBinding;
import com.dkanada.gramophone.activities.base.AbsBaseActivity;
import com.dkanada.gramophone.model.Server;
import com.dkanada.gramophone.model.User;
import com.dkanada.gramophone.util.PreferenceUtil;
import com.kabouzeid.appthemehelper.ThemeStore;
@ -102,7 +101,7 @@ public class LoginActivity extends AbsBaseActivity implements View.OnClickListen
@Override
public void onResponse(AuthenticationResult authenticationResult) {
if (authenticationResult.getAccessToken() != null) {
check(authenticationResult);
check(authenticationResult, server);
}
}
@ -120,17 +119,15 @@ public class LoginActivity extends AbsBaseActivity implements View.OnClickListen
});
}
private void check(AuthenticationResult authenticationResult) {
private void check(AuthenticationResult authenticationResult, String server) {
App.getApiClient().GetSystemInfoAsync(new Response<SystemInfo>() {
@Override
public void onResponse(SystemInfo result) {
if (result.getVersion().charAt(0) == '1') {
Server server = new Server(result);
User user = new User(authenticationResult);
User user = new User(authenticationResult, server);
App.getDatabase().serverDao().insertServer(server);
App.getDatabase().userDao().insertUser(user);
PreferenceUtil.getInstance(LoginActivity.this).setServer(server.id);
PreferenceUtil.getInstance(LoginActivity.this).setServer(user.server);
PreferenceUtil.getInstance(LoginActivity.this).setUser(user.id);
Intent intent = new Intent(LoginActivity.this, SplashActivity.class);

8
app/src/main/java/com/dkanada/gramophone/activities/SplashActivity.java
View file

@ -13,7 +13,6 @@ import androidx.annotation.RequiresApi;
import com.dkanada.gramophone.App;
import com.dkanada.gramophone.R;
import com.dkanada.gramophone.activities.base.AbsBaseActivity;
import com.dkanada.gramophone.model.Server;
import com.dkanada.gramophone.model.User;
import com.dkanada.gramophone.util.NavigationUtil;
import com.dkanada.gramophone.util.PreferenceUtil;
@ -80,16 +79,15 @@ public class SplashActivity extends AbsBaseActivity {
public void login() {
Context context = this;
Server server = App.getDatabase().serverDao().getServer(PreferenceUtil.getInstance(this).getServer());
User user = App.getDatabase().userDao().getUser(PreferenceUtil.getInstance(this).getUser());
if (server == null || user == null) {
if (user == null) {
NavigationUtil.goToLogin(this);
return;
}
App.getApiClient().ChangeServerLocation(server.url);
App.getApiClient().SetAuthenticationInfo(user.token, user.name);
App.getApiClient().ChangeServerLocation(user.server);
App.getApiClient().SetAuthenticationInfo(user.token, user.id);
App.getApiClient().GetSystemInfoAsync(new Response<SystemInfo>() {
@Override
public void onResponse(SystemInfo result) {