commit
c509aaf7c6
3 changed files with 43 additions and 2 deletions
|
|
@ -20,6 +20,7 @@ android {
|
||||||
release {
|
release {
|
||||||
minifyEnabled true
|
minifyEnabled true
|
||||||
shrinkResources true
|
shrinkResources true
|
||||||
|
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
|
||||||
}
|
}
|
||||||
|
|
||||||
debug {
|
debug {
|
||||||
|
|
|
||||||
31
app/proguard-rules.pro
vendored
Normal file
31
app/proguard-rules.pro
vendored
Normal file
|
|
@ -0,0 +1,31 @@
|
||||||
|
-dontwarn
|
||||||
|
-ignorewarnings
|
||||||
|
|
||||||
|
# RetroFit
|
||||||
|
-dontwarn retrofit.**
|
||||||
|
-keep class retrofit.** { *; }
|
||||||
|
-keepattributes Signature
|
||||||
|
-keepattributes Exceptions
|
||||||
|
|
||||||
|
# Glide
|
||||||
|
-keep public class * implements com.bumptech.glide.module.GlideModule
|
||||||
|
-keep public enum com.bumptech.glide.load.resource.bitmap.ImageHeaderParser$** {
|
||||||
|
**[] $VALUES;
|
||||||
|
public *;
|
||||||
|
}
|
||||||
|
|
||||||
|
# ButterKnife
|
||||||
|
-keep class butterknife.** { *; }
|
||||||
|
-dontwarn butterknife.internal.**
|
||||||
|
-keep class **$$ViewBinder { *; }
|
||||||
|
-keepclasseswithmembernames class * {
|
||||||
|
@butterknife.* <fields>;
|
||||||
|
}
|
||||||
|
-keepclasseswithmembernames class * {
|
||||||
|
@butterknife.* <methods>;
|
||||||
|
}
|
||||||
|
|
||||||
|
-keep class !android.support.v7.internal.view.menu.**,** {*;}
|
||||||
|
|
||||||
|
# Jellyfin API models
|
||||||
|
-keepclasseswithmembers class org.jellyfin.apiclient.model.**.* { *; }
|
||||||
|
|
@ -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,13 @@ 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) {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue