Merge pull request #4890 from ByteHamster/authentication
Make authentication dialog easier to use
This commit is contained in:
commit
176e8e7a98
|
@ -88,6 +88,7 @@
|
||||||
|
|
||||||
<activity
|
<activity
|
||||||
android:name=".activity.DownloadAuthenticationActivity"
|
android:name=".activity.DownloadAuthenticationActivity"
|
||||||
|
android:theme="@style/Theme.AntennaPod.Dark.Translucent"
|
||||||
android:launchMode="singleInstance"/>
|
android:launchMode="singleInstance"/>
|
||||||
|
|
||||||
<activity
|
<activity
|
||||||
|
|
|
@ -1,11 +1,7 @@
|
||||||
package de.danoeh.antennapod.activity;
|
package de.danoeh.antennapod.activity;
|
||||||
|
|
||||||
import android.app.Activity;
|
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.text.TextUtils;
|
import android.text.TextUtils;
|
||||||
import android.widget.EditText;
|
|
||||||
import android.widget.TextView;
|
|
||||||
import androidx.annotation.NonNull;
|
|
||||||
import androidx.appcompat.app.AppCompatActivity;
|
import androidx.appcompat.app.AppCompatActivity;
|
||||||
import de.danoeh.antennapod.R;
|
import de.danoeh.antennapod.R;
|
||||||
import de.danoeh.antennapod.core.feed.FeedMedia;
|
import de.danoeh.antennapod.core.feed.FeedMedia;
|
||||||
|
@ -15,6 +11,7 @@ import de.danoeh.antennapod.core.service.download.DownloadRequest;
|
||||||
import de.danoeh.antennapod.core.storage.DBReader;
|
import de.danoeh.antennapod.core.storage.DBReader;
|
||||||
import de.danoeh.antennapod.core.storage.DBWriter;
|
import de.danoeh.antennapod.core.storage.DBWriter;
|
||||||
import de.danoeh.antennapod.core.storage.DownloadRequester;
|
import de.danoeh.antennapod.core.storage.DownloadRequester;
|
||||||
|
import de.danoeh.antennapod.dialog.AuthenticationDialog;
|
||||||
import io.reactivex.Completable;
|
import io.reactivex.Completable;
|
||||||
import io.reactivex.android.schedulers.AndroidSchedulers;
|
import io.reactivex.android.schedulers.AndroidSchedulers;
|
||||||
import io.reactivex.schedulers.Schedulers;
|
import io.reactivex.schedulers.Schedulers;
|
||||||
|
@ -32,71 +29,48 @@ public class DownloadAuthenticationActivity extends AppCompatActivity {
|
||||||
*/
|
*/
|
||||||
public static final String ARG_DOWNLOAD_REQUEST = "request";
|
public static final String ARG_DOWNLOAD_REQUEST = "request";
|
||||||
|
|
||||||
private EditText etxtUsername;
|
|
||||||
private EditText etxtPassword;
|
|
||||||
private DownloadRequest request;
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onCreate(Bundle savedInstanceState) {
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
setTheme(UserPreferences.getNoTitleTheme());
|
setTheme(UserPreferences.getTranslucentTheme());
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
setContentView(R.layout.download_authentication_activity);
|
|
||||||
|
|
||||||
etxtUsername = findViewById(R.id.etxtUsername);
|
|
||||||
etxtPassword = findViewById(R.id.etxtPassword);
|
|
||||||
|
|
||||||
Validate.isTrue(getIntent().hasExtra(ARG_DOWNLOAD_REQUEST), "Download request missing");
|
Validate.isTrue(getIntent().hasExtra(ARG_DOWNLOAD_REQUEST), "Download request missing");
|
||||||
request = getIntent().getParcelableExtra(ARG_DOWNLOAD_REQUEST);
|
DownloadRequest request = getIntent().getParcelableExtra(ARG_DOWNLOAD_REQUEST);
|
||||||
|
|
||||||
TextView txtvDescription = findViewById(R.id.txtvDescription);
|
new AuthenticationDialog(this, R.string.authentication_label, true, "", "") {
|
||||||
String newDescription = txtvDescription.getText() + ":\n\n" + request.getTitle();
|
@Override
|
||||||
txtvDescription.setText(newDescription);
|
protected void onConfirmed(String username, String password) {
|
||||||
|
Completable.fromAction(
|
||||||
|
() -> {
|
||||||
|
request.setUsername(username);
|
||||||
|
request.setPassword(password);
|
||||||
|
|
||||||
if (savedInstanceState != null) {
|
if (request.getFeedfileType() == FeedMedia.FEEDFILETYPE_FEEDMEDIA) {
|
||||||
etxtUsername.setText(savedInstanceState.getString("username"));
|
long mediaId = request.getFeedfileId();
|
||||||
etxtPassword.setText(savedInstanceState.getString("password"));
|
FeedMedia media = DBReader.getFeedMedia(mediaId);
|
||||||
}
|
if (media != null) {
|
||||||
|
FeedPreferences preferences = media.getItem().getFeed().getPreferences();
|
||||||
findViewById(R.id.butConfirm).setOnClickListener(v ->
|
if (TextUtils.isEmpty(preferences.getPassword())
|
||||||
Completable.fromAction(this::updatePassword)
|
|| TextUtils.isEmpty(preferences.getUsername())) {
|
||||||
.subscribeOn(Schedulers.io())
|
preferences.setUsername(username);
|
||||||
.observeOn(AndroidSchedulers.mainThread())
|
preferences.setPassword(password);
|
||||||
.subscribe(() -> {
|
DBWriter.setFeedPreferences(preferences);
|
||||||
DownloadRequester.getInstance().download(DownloadAuthenticationActivity.this, request);
|
}
|
||||||
finish();
|
}
|
||||||
}));
|
}
|
||||||
|
})
|
||||||
findViewById(R.id.butCancel).setOnClickListener(v -> {
|
.subscribeOn(Schedulers.io())
|
||||||
setResult(Activity.RESULT_CANCELED);
|
.observeOn(AndroidSchedulers.mainThread())
|
||||||
finish();
|
.subscribe(() -> {
|
||||||
});
|
DownloadRequester.getInstance().download(DownloadAuthenticationActivity.this, request);
|
||||||
|
finish();
|
||||||
}
|
});
|
||||||
|
|
||||||
private void updatePassword() {
|
|
||||||
String username = etxtUsername.getText().toString();
|
|
||||||
String password = etxtPassword.getText().toString();
|
|
||||||
request.setUsername(username);
|
|
||||||
request.setPassword(password);
|
|
||||||
|
|
||||||
if (request.getFeedfileType() == FeedMedia.FEEDFILETYPE_FEEDMEDIA) {
|
|
||||||
long mediaId = request.getFeedfileId();
|
|
||||||
FeedMedia media = DBReader.getFeedMedia(mediaId);
|
|
||||||
if (media != null) {
|
|
||||||
FeedPreferences preferences = media.getItem().getFeed().getPreferences();
|
|
||||||
if (TextUtils.isEmpty(preferences.getPassword()) || TextUtils.isEmpty(preferences.getUsername())) {
|
|
||||||
preferences.setUsername(username);
|
|
||||||
preferences.setPassword(password);
|
|
||||||
DBWriter.setFeedPreferences(preferences);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onSaveInstanceState(@NonNull Bundle outState) {
|
protected void onCancelled() {
|
||||||
super.onSaveInstanceState(outState);
|
finish();
|
||||||
outState.putString("username", etxtUsername.getText().toString());
|
}
|
||||||
outState.putString("password", etxtPassword.getText().toString());
|
}.show();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -30,6 +30,7 @@ public class DownloadServiceCallbacksImpl implements DownloadServiceCallbacks {
|
||||||
@Override
|
@Override
|
||||||
public PendingIntent getAuthentificationNotificationContentIntent(Context context, DownloadRequest request) {
|
public PendingIntent getAuthentificationNotificationContentIntent(Context context, DownloadRequest request) {
|
||||||
final Intent activityIntent = new Intent(context.getApplicationContext(), DownloadAuthenticationActivity.class);
|
final Intent activityIntent = new Intent(context.getApplicationContext(), DownloadAuthenticationActivity.class);
|
||||||
|
activityIntent.setAction("request" + request.getFeedfileId());
|
||||||
activityIntent.putExtra(DownloadAuthenticationActivity.ARG_DOWNLOAD_REQUEST, request);
|
activityIntent.putExtra(DownloadAuthenticationActivity.ARG_DOWNLOAD_REQUEST, request);
|
||||||
return PendingIntent.getActivity(context.getApplicationContext(),
|
return PendingIntent.getActivity(context.getApplicationContext(),
|
||||||
R.id.pending_intent_download_service_auth, activityIntent, PendingIntent.FLAG_ONE_SHOT);
|
R.id.pending_intent_download_service_auth, activityIntent, PendingIntent.FLAG_ONE_SHOT);
|
||||||
|
|
|
@ -1,37 +1,50 @@
|
||||||
package de.danoeh.antennapod.dialog;
|
package de.danoeh.antennapod.dialog;
|
||||||
|
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.view.View;
|
import android.text.method.HideReturnsTransformationMethod;
|
||||||
import android.widget.EditText;
|
import android.text.method.PasswordTransformationMethod;
|
||||||
|
import android.view.LayoutInflater;
|
||||||
import androidx.appcompat.app.AlertDialog;
|
import androidx.appcompat.app.AlertDialog;
|
||||||
import de.danoeh.antennapod.R;
|
import de.danoeh.antennapod.R;
|
||||||
|
import de.danoeh.antennapod.databinding.AuthenticationDialogBinding;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Displays a dialog with a username and password text field and an optional checkbox to save username and preferences.
|
* Displays a dialog with a username and password text field and an optional checkbox to save username and preferences.
|
||||||
*/
|
*/
|
||||||
public abstract class AuthenticationDialog extends AlertDialog.Builder {
|
public abstract class AuthenticationDialog extends AlertDialog.Builder {
|
||||||
|
boolean passwordHidden = true;
|
||||||
|
|
||||||
public AuthenticationDialog(Context context, int titleRes, boolean enableUsernameField,
|
public AuthenticationDialog(Context context, int titleRes, boolean enableUsernameField,
|
||||||
String usernameInitialValue, String passwordInitialValue) {
|
String usernameInitialValue, String passwordInitialValue) {
|
||||||
super(context);
|
super(context);
|
||||||
setTitle(titleRes);
|
setTitle(titleRes);
|
||||||
View rootView = View.inflate(context, R.layout.authentication_dialog, null);
|
AuthenticationDialogBinding viewBinding = AuthenticationDialogBinding.inflate(LayoutInflater.from(context));
|
||||||
setView(rootView);
|
setView(viewBinding.getRoot());
|
||||||
|
|
||||||
final EditText etxtUsername = rootView.findViewById(R.id.etxtUsername);
|
viewBinding.usernameEditText.setEnabled(enableUsernameField);
|
||||||
final EditText etxtPassword = rootView.findViewById(R.id.etxtPassword);
|
|
||||||
|
|
||||||
etxtUsername.setEnabled(enableUsernameField);
|
|
||||||
if (usernameInitialValue != null) {
|
if (usernameInitialValue != null) {
|
||||||
etxtUsername.setText(usernameInitialValue);
|
viewBinding.usernameEditText.setText(usernameInitialValue);
|
||||||
}
|
}
|
||||||
if (passwordInitialValue != null) {
|
if (passwordInitialValue != null) {
|
||||||
etxtPassword.setText(passwordInitialValue);
|
viewBinding.passwordEditText.setText(passwordInitialValue);
|
||||||
}
|
}
|
||||||
|
viewBinding.showPasswordButton.setOnClickListener(v -> {
|
||||||
|
if (passwordHidden) {
|
||||||
|
viewBinding.passwordEditText.setTransformationMethod(HideReturnsTransformationMethod.getInstance());
|
||||||
|
viewBinding.showPasswordButton.setAlpha(1.0f);
|
||||||
|
} else {
|
||||||
|
viewBinding.passwordEditText.setTransformationMethod(PasswordTransformationMethod.getInstance());
|
||||||
|
viewBinding.showPasswordButton.setAlpha(0.6f);
|
||||||
|
}
|
||||||
|
passwordHidden = !passwordHidden;
|
||||||
|
});
|
||||||
|
|
||||||
setOnCancelListener(dialog -> onCancelled());
|
setOnCancelListener(dialog -> onCancelled());
|
||||||
|
setOnDismissListener(dialog -> onCancelled());
|
||||||
setNegativeButton(R.string.cancel_label, null);
|
setNegativeButton(R.string.cancel_label, null);
|
||||||
setPositiveButton(R.string.confirm_label, (dialog, which)
|
setPositiveButton(R.string.confirm_label, (dialog, which)
|
||||||
-> onConfirmed(etxtUsername.getText().toString(), etxtPassword.getText().toString()));
|
-> onConfirmed(viewBinding.usernameEditText.getText().toString(),
|
||||||
|
viewBinding.passwordEditText.getText().toString()));
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void onCancelled() {
|
protected void onCancelled() {
|
||||||
|
|
|
@ -1,30 +1,59 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
<LinearLayout
|
||||||
android:layout_width="match_parent"
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:layout_height="match_parent"
|
|
||||||
android:orientation="vertical" >
|
|
||||||
|
|
||||||
<EditText
|
|
||||||
android:id="@+id/etxtUsername"
|
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="0dp"
|
android:layout_height="match_parent"
|
||||||
android:layout_weight="1"
|
android:orientation="vertical"
|
||||||
android:layout_margin="16dp"
|
android:padding="16dp">
|
||||||
android:hint="@string/username_label"
|
|
||||||
android:focusable="true"
|
|
||||||
android:focusableInTouchMode="true"
|
|
||||||
android:cursorVisible="true"/>
|
|
||||||
|
|
||||||
<EditText
|
<com.google.android.material.textfield.TextInputLayout
|
||||||
android:id="@+id/etxtPassword"
|
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="0dp"
|
android:layout_height="wrap_content"
|
||||||
android:layout_weight="1"
|
android:layout_marginBottom="8dp">
|
||||||
android:layout_margin="16dp"
|
|
||||||
android:inputType="textPassword"
|
|
||||||
android:hint="@string/password_label"
|
|
||||||
android:focusable="true"
|
|
||||||
android:focusableInTouchMode="true"
|
|
||||||
android:cursorVisible="true"/>
|
|
||||||
|
|
||||||
|
<com.google.android.material.textfield.TextInputEditText
|
||||||
|
android:id="@+id/usernameEditText"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:hint="@string/username_label"
|
||||||
|
android:lines="1"/>
|
||||||
|
|
||||||
|
</com.google.android.material.textfield.TextInputLayout>
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="horizontal">
|
||||||
|
|
||||||
|
<com.google.android.material.textfield.TextInputLayout
|
||||||
|
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_weight="1">
|
||||||
|
|
||||||
|
<com.google.android.material.textfield.TextInputEditText
|
||||||
|
android:id="@+id/passwordEditText"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:hint="@string/password_label"
|
||||||
|
android:inputType="textPassword"
|
||||||
|
android:lines="1"/>
|
||||||
|
|
||||||
|
</com.google.android.material.textfield.TextInputLayout>
|
||||||
|
|
||||||
|
<com.joanzapata.iconify.widget.IconTextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:id="@+id/showPasswordButton"
|
||||||
|
android:text="{fa-eye}"
|
||||||
|
android:padding="8dp"
|
||||||
|
android:textColor="?android:attr/textColorPrimary"
|
||||||
|
android:background="?attr/selectableItemBackgroundBorderless"
|
||||||
|
android:alpha="0.6"
|
||||||
|
android:textSize="20sp"
|
||||||
|
android:layout_marginLeft="8dp"
|
||||||
|
android:layout_marginStart="8dp"/>
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
</LinearLayout>
|
</LinearLayout>
|
|
@ -1,64 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<LinearLayout
|
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
android:orientation="vertical"
|
|
||||||
android:padding="16dp">
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/txtvTitle"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/authentication_notification_title"
|
|
||||||
android:textSize="@dimen/text_size_large"
|
|
||||||
android:textColor="?android:attr/textColorPrimary"/>
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/txtvDescription"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/authentication_notification_msg"
|
|
||||||
android:textColor="?android:attr/textColorSecondary"/>
|
|
||||||
|
|
||||||
<EditText
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:id="@+id/etxtUsername"
|
|
||||||
android:hint="@string/username_label"
|
|
||||||
android:focusable="true"
|
|
||||||
android:focusableInTouchMode="true"
|
|
||||||
android:cursorVisible="true"/>
|
|
||||||
|
|
||||||
<EditText
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:id="@+id/etxtPassword"
|
|
||||||
android:hint="@string/password_label"
|
|
||||||
android:inputType="textPassword"
|
|
||||||
android:focusable="true"
|
|
||||||
android:focusableInTouchMode="true"
|
|
||||||
android:cursorVisible="true"/>
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="fill_parent"
|
|
||||||
android:layout_height="48dp"
|
|
||||||
android:orientation="horizontal"
|
|
||||||
android:gravity="end">
|
|
||||||
|
|
||||||
<Button
|
|
||||||
android:id="@+id/butCancel"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/cancel_label"
|
|
||||||
style="@style/Widget.MaterialComponents.Button.TextButton"/>
|
|
||||||
|
|
||||||
<Button
|
|
||||||
android:id="@+id/butConfirm"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/confirm_label"
|
|
||||||
style="@style/Widget.MaterialComponents.Button.TextButton"/>
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
</LinearLayout>
|
|
|
@ -95,7 +95,6 @@
|
||||||
<string name="description_label">Description</string>
|
<string name="description_label">Description</string>
|
||||||
<string name="episodes_suffix">\u0020episodes</string>
|
<string name="episodes_suffix">\u0020episodes</string>
|
||||||
<string name="processing_label">Processing</string>
|
<string name="processing_label">Processing</string>
|
||||||
<string name="save_username_password_label">Save username and password</string>
|
|
||||||
<string name="close_label">Close</string>
|
<string name="close_label">Close</string>
|
||||||
<string name="retry_label">Retry</string>
|
<string name="retry_label">Retry</string>
|
||||||
<string name="auto_download_label">Include in auto downloads</string>
|
<string name="auto_download_label">Include in auto downloads</string>
|
||||||
|
|
Loading…
Reference in New Issue