diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 096c48eb..cead0ad4 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -65,7 +65,7 @@ + android:parentActivityName="org.kde.kdeconnect.UserInterface.PluginSettingsActivity"> + android:value="org.kde.kdeconnect.UserInterface.PluginSettingsActivity" /> diff --git a/res/layout/activity_device_settings.xml b/res/layout/activity_plugin_settings.xml similarity index 100% rename from res/layout/activity_device_settings.xml rename to res/layout/activity_plugin_settings.xml diff --git a/src/org/kde/kdeconnect/Plugins/RemoteKeyboardPlugin/RemoteKeyboardService.java b/src/org/kde/kdeconnect/Plugins/RemoteKeyboardPlugin/RemoteKeyboardService.java index aec708f4..32f5b74c 100644 --- a/src/org/kde/kdeconnect/Plugins/RemoteKeyboardPlugin/RemoteKeyboardService.java +++ b/src/org/kde/kdeconnect/Plugins/RemoteKeyboardPlugin/RemoteKeyboardService.java @@ -34,7 +34,7 @@ import android.view.inputmethod.EditorInfo; import android.view.inputmethod.InputMethodManager; import android.widget.Toast; -import org.kde.kdeconnect.UserInterface.DeviceSettingsActivity; +import org.kde.kdeconnect.UserInterface.PluginSettingsActivity; import org.kde.kdeconnect.UserInterface.MainActivity; import org.kde.kdeconnect_tp.R; @@ -167,10 +167,10 @@ public class RemoteKeyboardService if (instances.size() == 1) { // single instance of RemoteKeyboardPlugin -> access its settings RemoteKeyboardPlugin plugin = instances.get(0); if (plugin != null) { - Intent intent = new Intent(this, DeviceSettingsActivity.class); + Intent intent = new Intent(this, PluginSettingsActivity.class); intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - intent.putExtra(DeviceSettingsActivity.EXTRA_DEVICE_ID, plugin.getDeviceId()); - intent.putExtra(DeviceSettingsActivity.EXTRA_PLUGIN_KEY, plugin.getPluginKey()); + intent.putExtra(PluginSettingsActivity.EXTRA_DEVICE_ID, plugin.getDeviceId()); + intent.putExtra(PluginSettingsActivity.EXTRA_PLUGIN_KEY, plugin.getPluginKey()); startActivity(intent); } } else { // != 1 instance of plugin -> show main activity view diff --git a/src/org/kde/kdeconnect/Plugins/SftpPlugin/SftpSettingsFragment.java b/src/org/kde/kdeconnect/Plugins/SftpPlugin/SftpSettingsFragment.java index f05c9f32..c81594de 100644 --- a/src/org/kde/kdeconnect/Plugins/SftpPlugin/SftpSettingsFragment.java +++ b/src/org/kde/kdeconnect/Plugins/SftpPlugin/SftpSettingsFragment.java @@ -42,7 +42,7 @@ import org.json.JSONObject; import org.kde.kdeconnect.BackgroundService; import org.kde.kdeconnect.Device; import org.kde.kdeconnect.Helpers.StorageHelper; -import org.kde.kdeconnect.UserInterface.DeviceSettingsActivity; +import org.kde.kdeconnect.UserInterface.PluginSettingsActivity; import org.kde.kdeconnect.UserInterface.PluginSettingsFragment; import org.kde.kdeconnect_tp.R; @@ -185,7 +185,7 @@ public class SftpSettingsFragment private void restoreActionMode() { try { if (savedActionModeState.getBoolean(KEY_ACTION_MODE_ENABLED)) { - actionMode = ((DeviceSettingsActivity)requireActivity()).startSupportActionMode(this); + actionMode = ((PluginSettingsActivity)requireActivity()).startSupportActionMode(this); if (actionMode != null) { JSONArray jsonArray = savedActionModeState.getJSONArray(KEY_ACTION_MODE_SELECTED_ITEMS); @@ -438,7 +438,7 @@ public class SftpSettingsFragment @Override public void onLongClick(StoragePreference storagePreference) { if (actionMode == null) { - actionMode = ((DeviceSettingsActivity)requireActivity()).startSupportActionMode(this); + actionMode = ((PluginSettingsActivity)requireActivity()).startSupportActionMode(this); if (actionMode != null) { for (int i = 0, count = preferenceCategory.getPreferenceCount(); i < count; i++) { diff --git a/src/org/kde/kdeconnect/UserInterface/DeviceFragment.java b/src/org/kde/kdeconnect/UserInterface/DeviceFragment.java index 6467d403..3131a318 100644 --- a/src/org/kde/kdeconnect/UserInterface/DeviceFragment.java +++ b/src/org/kde/kdeconnect/UserInterface/DeviceFragment.java @@ -229,7 +229,7 @@ public class DeviceFragment extends Fragment { } menu.add(R.string.device_menu_plugins).setOnMenuItemClickListener(menuItem -> { - Intent intent = new Intent(mActivity, DeviceSettingsActivity.class); + Intent intent = new Intent(mActivity, PluginSettingsActivity.class); intent.putExtra("deviceId", mDeviceId); startActivity(intent); return true; diff --git a/src/org/kde/kdeconnect/UserInterface/DeviceSettingsAlertDialogFragment.java b/src/org/kde/kdeconnect/UserInterface/DeviceSettingsAlertDialogFragment.java index 909c5b18..57e51de3 100644 --- a/src/org/kde/kdeconnect/UserInterface/DeviceSettingsAlertDialogFragment.java +++ b/src/org/kde/kdeconnect/UserInterface/DeviceSettingsAlertDialogFragment.java @@ -53,10 +53,10 @@ public class DeviceSettingsAlertDialogFragment extends AlertDialogFragment { setCallback(new Callback() { @Override public void onPositiveButtonClicked() { - Intent intent = new Intent(requireActivity(), DeviceSettingsActivity.class); + Intent intent = new Intent(requireActivity(), PluginSettingsActivity.class); - intent.putExtra(DeviceSettingsActivity.EXTRA_DEVICE_ID, deviceId); - intent.putExtra(DeviceSettingsActivity.EXTRA_PLUGIN_KEY, pluginKey); + intent.putExtra(PluginSettingsActivity.EXTRA_DEVICE_ID, deviceId); + intent.putExtra(PluginSettingsActivity.EXTRA_PLUGIN_KEY, pluginKey); requireActivity().startActivity(intent); } }); diff --git a/src/org/kde/kdeconnect/UserInterface/DeviceSettingsActivity.java b/src/org/kde/kdeconnect/UserInterface/PluginSettingsActivity.java similarity index 96% rename from src/org/kde/kdeconnect/UserInterface/DeviceSettingsActivity.java rename to src/org/kde/kdeconnect/UserInterface/PluginSettingsActivity.java index e382235b..3b485452 100644 --- a/src/org/kde/kdeconnect/UserInterface/DeviceSettingsActivity.java +++ b/src/org/kde/kdeconnect/UserInterface/PluginSettingsActivity.java @@ -32,7 +32,7 @@ import androidx.appcompat.app.AppCompatActivity; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; -public class DeviceSettingsActivity +public class PluginSettingsActivity extends AppCompatActivity implements PluginPreference.PluginPreferenceCallback { @@ -47,7 +47,7 @@ public class DeviceSettingsActivity ThemeUtil.setUserPreferredTheme(this); super.onCreate(savedInstanceState); - setContentView(R.layout.activity_device_settings); + setContentView(R.layout.activity_plugin_settings); if (getSupportActionBar() != null) { getSupportActionBar().setDefaultDisplayHomeAsUpEnabled(true); @@ -68,7 +68,7 @@ public class DeviceSettingsActivity Fragment fragment = getSupportFragmentManager().findFragmentById(R.id.fragmentPlaceHolder); if (fragment == null) { if (pluginKey == null) { - fragment = DeviceSettingsFragment.newInstance(deviceId); + fragment = PluginSettingsListFragment.newInstance(deviceId); } else { Device device = BackgroundService.getInstance().getDevice(deviceId); Plugin plugin = device.getPlugin(pluginKey); diff --git a/src/org/kde/kdeconnect/UserInterface/PluginSettingsFragment.java b/src/org/kde/kdeconnect/UserInterface/PluginSettingsFragment.java index c13a1fac..45e7f242 100644 --- a/src/org/kde/kdeconnect/UserInterface/PluginSettingsFragment.java +++ b/src/org/kde/kdeconnect/UserInterface/PluginSettingsFragment.java @@ -80,6 +80,6 @@ public class PluginSettingsFragment extends PreferenceFragmentCompat { } public String getDeviceId() { - return ((DeviceSettingsActivity)requireActivity()).getDeviceId(); + return ((PluginSettingsActivity)requireActivity()).getDeviceId(); } } diff --git a/src/org/kde/kdeconnect/UserInterface/DeviceSettingsFragment.java b/src/org/kde/kdeconnect/UserInterface/PluginSettingsListFragment.java similarity index 96% rename from src/org/kde/kdeconnect/UserInterface/DeviceSettingsFragment.java rename to src/org/kde/kdeconnect/UserInterface/PluginSettingsListFragment.java index 938155af..909f2d08 100644 --- a/src/org/kde/kdeconnect/UserInterface/DeviceSettingsFragment.java +++ b/src/org/kde/kdeconnect/UserInterface/PluginSettingsListFragment.java @@ -35,7 +35,7 @@ import androidx.preference.PreferenceFragmentCompat; import androidx.preference.PreferenceScreen; import androidx.recyclerview.widget.RecyclerView; -public class DeviceSettingsFragment extends PreferenceFragmentCompat { +public class PluginSettingsListFragment extends PreferenceFragmentCompat { private static final String ARG_DEVICE_ID = "deviceId"; private static final String KEY_RECYCLERVIEW_LAYOUTMANAGER_STATE = "RecyclerViewLayoutmanagerState"; @@ -50,8 +50,8 @@ public class DeviceSettingsFragment extends PreferenceFragmentCompat { */ private boolean stateSaved; - public static DeviceSettingsFragment newInstance(@NonNull String deviceId) { - DeviceSettingsFragment fragment = new DeviceSettingsFragment(); + public static PluginSettingsListFragment newInstance(@NonNull String deviceId) { + PluginSettingsListFragment fragment = new PluginSettingsListFragment(); Bundle args = new Bundle(); args.putString(ARG_DEVICE_ID, deviceId);