-
Notifications
You must be signed in to change notification settings - Fork 51
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Option allow remote access. This fixes previous security bug where external access was enabled by default. Option to specify user and password for authentication
- Loading branch information
1 parent
47608f5
commit 40668d6
Showing
7 changed files
with
327 additions
and
50 deletions.
There are no files selected for viewing
148 changes: 148 additions & 0 deletions
148
app/src/main/java/ca/pkay/rcloneexplorer/Dialogs/ServeDialog.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,148 @@ | ||
| package ca.pkay.rcloneexplorer.Dialogs; | ||
|
|
||
| import android.app.Dialog; | ||
| import android.content.Context; | ||
| import android.content.DialogInterface; | ||
| import android.os.Bundle; | ||
| import android.support.annotation.NonNull; | ||
| import android.support.annotation.Nullable; | ||
| import android.support.design.widget.TextInputLayout; | ||
| import android.support.v4.app.DialogFragment; | ||
| import android.support.v4.app.FragmentActivity; | ||
| import android.support.v7.app.AlertDialog; | ||
| import android.view.LayoutInflater; | ||
| import android.view.View; | ||
| import android.widget.CheckBox; | ||
| import android.widget.EditText; | ||
| import android.widget.RadioGroup; | ||
|
|
||
| import ca.pkay.rcloneexplorer.R; | ||
| import ca.pkay.rcloneexplorer.Rclone; | ||
|
|
||
| public class ServeDialog extends DialogFragment { | ||
|
|
||
| private Context context; | ||
| private boolean isDarkTheme; | ||
| private Callback callback; | ||
| private RadioGroup protocol; | ||
| private CheckBox allowRemoteAccess; | ||
| private EditText user; | ||
| private EditText password; | ||
|
|
||
| public interface Callback { | ||
| void onServeOptionsSelected(int protocol, boolean allowRemoteAccess, String user, String password); | ||
| } | ||
|
|
||
| @NonNull | ||
| @Override | ||
| public Dialog onCreateDialog(Bundle savedInstanceState) { | ||
| if (getParentFragment() != null) { | ||
| callback = (Callback) getParentFragment(); | ||
| } | ||
|
|
||
| if (savedInstanceState != null) { | ||
| isDarkTheme = savedInstanceState.getBoolean("isDarkTheme"); | ||
| } | ||
|
|
||
| AlertDialog.Builder builder; | ||
| if (isDarkTheme) { | ||
| builder = new AlertDialog.Builder(context, R.style.DarkDialogTheme); | ||
| } else { | ||
| builder = new AlertDialog.Builder(context); | ||
| } | ||
|
|
||
| LayoutInflater layoutInflater = ((FragmentActivity)context).getLayoutInflater(); | ||
| View view = layoutInflater.inflate(R.layout.dialog_serve, null); | ||
|
|
||
| protocol = view.findViewById(R.id.radio_group_protocol); | ||
| allowRemoteAccess = view.findViewById(R.id.checkbox_allow_remote_access); | ||
| user = view.findViewById(R.id.edit_text_user); | ||
| password = view.findViewById(R.id.edit_text_password); | ||
|
|
||
| ((TextInputLayout) view.findViewById(R.id.text_input_layout_user)).setHint("Username"); | ||
| ((TextInputLayout) view.findViewById(R.id.text_input_layout_password)).setHint("Password"); | ||
|
|
||
| builder.setTitle(R.string.serve_dialog_title); | ||
| builder.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() { | ||
| @Override | ||
| public void onClick(DialogInterface dialog, int which) { | ||
| sendCallback(); | ||
| } | ||
| }); | ||
|
|
||
| builder.setNegativeButton(R.string.cancel, null); | ||
|
|
||
| builder.setView(view); | ||
|
|
||
| return builder.show(); | ||
| } | ||
|
|
||
| @Override | ||
| public void onSaveInstanceState(Bundle outState) { | ||
| super.onSaveInstanceState(outState); | ||
| outState.putBoolean("isDarkTheme", isDarkTheme); | ||
| outState.putInt("protocol", protocol.getCheckedRadioButtonId()); | ||
| outState.putBoolean("allowRemoteAccess", allowRemoteAccess.isChecked()); | ||
| if (!user.getText().toString().trim().isEmpty()) { | ||
| outState.putString("user", user.getText().toString()); | ||
| } | ||
| if (!password.getText().toString().trim().isEmpty()) { | ||
| outState.putString("password", password.getText().toString()); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void onViewStateRestored(@Nullable Bundle savedInstanceState) { | ||
| super.onViewStateRestored(savedInstanceState); | ||
| if (savedInstanceState == null) { | ||
| return; | ||
| } | ||
|
|
||
| allowRemoteAccess.setChecked(savedInstanceState.getBoolean("allowRemoteAccess", false)); | ||
| String savedUser = savedInstanceState.getString("user"); | ||
| if (savedUser != null) { | ||
| user.setText(savedUser); | ||
| } | ||
|
|
||
| String savedPassword = savedInstanceState.getString("password"); | ||
| if (savedPassword != null) { | ||
| password.setText(savedPassword); | ||
| } | ||
|
|
||
| int savedProtocol = savedInstanceState.getInt("protocol", -1); | ||
| if (savedProtocol == R.id.radio_http || savedProtocol == R.id.radio_webdav) { | ||
| protocol.check(savedProtocol); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void onAttach(Context context) { | ||
| super.onAttach(context); | ||
| this.context = context; | ||
|
|
||
| if (context instanceof Callback) { | ||
| callback = (Callback) context; | ||
| } | ||
| } | ||
|
|
||
| public ServeDialog setDarkTheme(boolean isDarkTheme) { | ||
| this.isDarkTheme = isDarkTheme; | ||
| return this; | ||
| } | ||
|
|
||
| private void sendCallback() { | ||
| int selectedProtocolId = protocol.getCheckedRadioButtonId(); | ||
| int selectedProtocol; | ||
| switch (selectedProtocolId) { | ||
| case R.id.radio_webdav: | ||
| selectedProtocol = Rclone.SERVE_PROTOCOL_WEBDAV; | ||
| break; | ||
| case R.id.radio_http: | ||
| default: | ||
| selectedProtocol = Rclone.SERVE_PROTOCOL_HTTP; | ||
| break; | ||
| } | ||
|
|
||
| callback.onServeOptionsSelected(selectedProtocol, allowRemoteAccess.isChecked(), user.getText().toString(), password.getText().toString()); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.