mir/kdeconnect-android
2
0
Fork 0
mirror of https://github.com/KDE/kdeconnect-android synced 2025-09-01 22:55:10 +00:00
Code Issues Releases Wiki Activity

Fix Sftp preferences not working

Browse Source 
In version 1.1.0 of androidx, preferences do nothing on click if they are
not selectable. Added a new property "inSelectionMode" that we can use
instead of the built-in "selectable".
This commit is contained in:
Albert Vaca Cintora
2019-09-20 00:49:32 +02:00
parent caeb59eb3d
commit d8cbc38532
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/org/kde/kdeconnect/Plugins/SftpPlugin/SftpSettingsFragment.java
View File

@@ -197,7 +197,7 @@ public class SftpSettingsFragment
for (int i = 0, count = preferenceCategory.getPreferenceCount(); i < count; i++) { for (int i = 0, count = preferenceCategory.getPreferenceCount(); i < count; i++) {
StoragePreference preference = (StoragePreference) preferenceCategory.getPreference(i); StoragePreference preference = (StoragePreference) preferenceCategory.getPreference(i);
preference.setSelectable(true); preference.setInSelectionMode(true);
preference.checkbox.setChecked(selectedItems.get(i, false)); preference.checkbox.setChecked(selectedItems.get(i, false));
} }
} }
@@ -443,7 +443,7 @@ public class SftpSettingsFragment
if (actionMode != null) { if (actionMode != null) {
for (int i = 0, count = preferenceCategory.getPreferenceCount(); i < count; i++) { for (int i = 0, count = preferenceCategory.getPreferenceCount(); i < count; i++) {
StoragePreference preference = (StoragePreference) preferenceCategory.getPreference(i); StoragePreference preference = (StoragePreference) preferenceCategory.getPreference(i);
preference.setSelectable(true); preference.setInSelectionMode(true);
if (storagePreference.equals(preference)) { if (storagePreference.equals(preference)) {
preference.checkbox.setChecked(true); preference.checkbox.setChecked(true);
} }
@@ -499,7 +499,7 @@ public class SftpSettingsFragment
for (int i = 0, count = preferenceCategory.getPreferenceCount(); i < count; i++) { for (int i = 0, count = preferenceCategory.getPreferenceCount(); i < count; i++) {
StoragePreference preference = (StoragePreference) preferenceCategory.getPreference(i); StoragePreference preference = (StoragePreference) preferenceCategory.getPreference(i);
preference.setSelectable(false); preference.setInSelectionMode(false);
preference.checkbox.setChecked(false); preference.checkbox.setChecked(false);
} }
} }

14
src/org/kde/kdeconnect/Plugins/SftpPlugin/StoragePreference.java
View File

@@ -43,6 +43,14 @@ public class StoragePreference extends DialogPreference {
private OnLongClickListener onLongClickListener; private OnLongClickListener onLongClickListener;
@BindView(R.id.checkbox) CheckBox checkbox; @BindView(R.id.checkbox) CheckBox checkbox;
public boolean inSelectionMode;
public void setInSelectionMode(boolean inSelectionMode) {
if (this.inSelectionMode != inSelectionMode) {
this.inSelectionMode = inSelectionMode;
notifyChanged();
}
}
public StoragePreference(Context context, AttributeSet attrs) { public StoragePreference(Context context, AttributeSet attrs) {
super(context, attrs); super(context, attrs);
@@ -50,7 +58,7 @@ public class StoragePreference extends DialogPreference {
setDialogLayoutResource(R.layout.fragment_storage_preference_dialog); setDialogLayoutResource(R.layout.fragment_storage_preference_dialog);
setWidgetLayoutResource(R.layout.preference_checkbox); setWidgetLayoutResource(R.layout.preference_checkbox);
setPersistent(false); setPersistent(false);
setSelectable(false); inSelectionMode = false;
} }
public StoragePreference(Context context) { public StoragePreference(Context context) {
@@ -109,7 +117,7 @@ public class StoragePreference extends DialogPreference {
ButterKnife.bind(this, holder.itemView); ButterKnife.bind(this, holder.itemView);
checkbox.setVisibility(isSelectable() ? View.VISIBLE : View.INVISIBLE); checkbox.setVisibility(inSelectionMode ? View.VISIBLE : View.INVISIBLE);
holder.itemView.setOnLongClickListener(v -> { holder.itemView.setOnLongClickListener(v -> {
if (onLongClickListener != null) { if (onLongClickListener != null) {
@@ -122,7 +130,7 @@ public class StoragePreference extends DialogPreference {
@Override @Override
protected void onClick() { protected void onClick() {
if (isSelectable()) { if (inSelectionMode) {
checkbox.setChecked(!checkbox.isChecked()); checkbox.setChecked(!checkbox.isChecked());
} else { } else {
super.onClick(); super.onClick();