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

Fix crash when entering wrong IP

Browse source
This commit is contained in:
Maxr1998 2020-05-19 12:23:00 +02:00 • committed by dkanada
commit 789ef65e69
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -11,10 +11,10 @@ import android.widget.EditText;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.appcompat.widget.Toolbar; import androidx.appcompat.widget.Toolbar;
import com.kabouzeid.appthemehelper.ThemeStore;
import com.dkanada.gramophone.App; import com.dkanada.gramophone.App;
import com.dkanada.gramophone.R; import com.dkanada.gramophone.R;
import com.dkanada.gramophone.ui.activities.base.AbsBaseActivity; import com.dkanada.gramophone.ui.activities.base.AbsBaseActivity;
import com.kabouzeid.appthemehelper.ThemeStore;
import org.jellyfin.apiclient.interaction.AndroidCredentialProvider; import org.jellyfin.apiclient.interaction.AndroidCredentialProvider;
import org.jellyfin.apiclient.interaction.ConnectionResult; import org.jellyfin.apiclient.interaction.ConnectionResult;
@ -24,11 +24,14 @@ import org.jellyfin.apiclient.interaction.connectionmanager.ConnectionManager;
import org.jellyfin.apiclient.interaction.http.IAsyncHttpClient; import org.jellyfin.apiclient.interaction.http.IAsyncHttpClient;
import org.jellyfin.apiclient.logging.AndroidLogger; import org.jellyfin.apiclient.logging.AndroidLogger;
import org.jellyfin.apiclient.model.apiclient.ServerCredentials; import org.jellyfin.apiclient.model.apiclient.ServerCredentials;
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.users.AuthenticationResult; import org.jellyfin.apiclient.model.users.AuthenticationResult;
import java.util.List;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
@ -99,7 +102,12 @@ public class LoginActivity extends AbsBaseActivity implements View.OnClickListen
public void onResponse(ConnectionResult result) { public void onResponse(ConnectionResult result) {
App.setApiClient(result.getApiClient()); App.setApiClient(result.getApiClient());
ServerCredentials serverCredentials = new ServerCredentials(); ServerCredentials serverCredentials = new ServerCredentials();
serverCredentials.AddOrUpdateServer(result.getServers().get(0)); List<ServerInfo> servers = result.getServers();
if (servers.size() < 1)
return;
serverCredentials.AddOrUpdateServer(servers.get(0));
App.getApiClient().AuthenticateUserAsync(username.getText().toString(), password.getText().toString(), new Response<AuthenticationResult>() { App.getApiClient().AuthenticateUserAsync(username.getText().toString(), password.getText().toString(), new Response<AuthenticationResult>() {
@Override @Override
public void onResponse(AuthenticationResult result) { public void onResponse(AuthenticationResult result) {