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

add version check for server

Browse source
This commit is contained in:
dkanada 2020-06-20 22:25:16 +09:00
commit 4d1dfbf325
1 changed files with 21 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -28,6 +28,7 @@ import org.jellyfin.apiclient.model.apiclient.ServerInfo;
import org.jellyfin.apiclient.model.logging.ILogger; import org.jellyfin.apiclient.model.logging.ILogger;
import org.jellyfin.apiclient.model.serialization.GsonJsonSerializer; import org.jellyfin.apiclient.model.serialization.GsonJsonSerializer;
import org.jellyfin.apiclient.model.serialization.IJsonSerializer; import org.jellyfin.apiclient.model.serialization.IJsonSerializer;
import org.jellyfin.apiclient.model.system.SystemInfo;
import org.jellyfin.apiclient.model.users.AuthenticationResult; import org.jellyfin.apiclient.model.users.AuthenticationResult;
import java.util.List; import java.util.List;
@ -36,7 +37,8 @@ import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
public class LoginActivity extends AbsBaseActivity implements View.OnClickListener { public class LoginActivity extends AbsBaseActivity implements View.OnClickListener {
public static final String TAG = SplashActivity.class.getSimpleName(); public String TAG = SplashActivity.class.getSimpleName();
public AndroidCredentialProvider credentialProvider;
@BindView(R.id.toolbar) @BindView(R.id.toolbar)
Toolbar toolbar; Toolbar toolbar;
@ -96,7 +98,7 @@ public class LoginActivity extends AbsBaseActivity implements View.OnClickListen
ILogger logger = new AndroidLogger(TAG); ILogger logger = new AndroidLogger(TAG);
IAsyncHttpClient httpClient = new VolleyHttpClient(logger, this); IAsyncHttpClient httpClient = new VolleyHttpClient(logger, this);
AndroidCredentialProvider credentialProvider = new AndroidCredentialProvider(jsonSerializer, this, logger); credentialProvider = new AndroidCredentialProvider(jsonSerializer, this, logger);
ConnectionManager connectionManager = App.getConnectionManager(context, jsonSerializer, logger, httpClient); ConnectionManager connectionManager = App.getConnectionManager(context, jsonSerializer, logger, httpClient);
connectionManager.Connect(server.getText().toString(), new Response<ConnectionResult>() { connectionManager.Connect(server.getText().toString(), new Response<ConnectionResult>() {
@Override @Override
@ -114,16 +116,27 @@ public class LoginActivity extends AbsBaseActivity implements View.OnClickListen
@Override @Override
public void onResponse(AuthenticationResult result) { public void onResponse(AuthenticationResult result) {
if (result.getAccessToken() == null) return; if (result.getAccessToken() == null) return;
serverCredentials.GetServer(result.getServerId()).setAccessToken(result.getAccessToken()); check(context, serverCredentials, result);
}
});
}
});
}
}
public void check(Context context, ServerCredentials serverCredentials, AuthenticationResult authenticationResult) {
App.getApiClient().GetSystemInfoAsync(new Response<SystemInfo>() {
@Override
public void onResponse(SystemInfo result) {
if (Integer.parseInt(result.getVersion().substring(0, 1)) == 1) {
serverCredentials.GetServer(authenticationResult.getServerId()).setAccessToken(authenticationResult.getAccessToken());
credentialProvider.SaveCredentials(serverCredentials); credentialProvider.SaveCredentials(serverCredentials);
Intent intent = new Intent(context, MainActivity.class); Intent intent = new Intent(context, MainActivity.class);
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK); intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
context.startActivity(intent); context.startActivity(intent);
} }
});
} }
}); });
} }
} }
}