mirror of
https://github.com/KDE/kdeconnect-android
synced 2025-09-05 16:45:08 +00:00
Use lambdas where possible
Summary: Let Android Studio replace anonymous types with lambdas. No manual code change. Test Plan: Compile and superficial behaviour test Reviewers: #kde_connect, philipc Reviewed By: #kde_connect, philipc Subscribers: philipc, #kde_connect Tags: #kde_connect Differential Revision: https://phabricator.kde.org/D12229
This commit is contained in:
Nicolas Fella
@@ -110,97 +110,64 @@ public class DeviceFragment extends Fragment {
|
||||
|
||||
//Log.e("DeviceFragment", "device: " + deviceId);
|
||||
|
||||
BackgroundService.RunCommand(mActivity, new BackgroundService.InstanceCallback() {
|
||||
@Override
|
||||
public void onServiceStart(BackgroundService service) {
|
||||
device = service.getDevice(mDeviceId);
|
||||
if (device == null) {
|
||||
Log.e("DeviceFragment", "Trying to display a device fragment but the device is not present");
|
||||
mActivity.onDeviceSelected(null);
|
||||
return;
|
||||
}
|
||||
|
||||
mActivity.getSupportActionBar().setTitle(device.getName());
|
||||
|
||||
device.addPairingCallback(pairingCallback);
|
||||
device.addPluginsChangedListener(pluginsChangedListener);
|
||||
|
||||
refreshUI();
|
||||
|
||||
BackgroundService.RunCommand(mActivity, service -> {
|
||||
device = service.getDevice(mDeviceId);
|
||||
if (device == null) {
|
||||
Log.e("DeviceFragment", "Trying to display a device fragment but the device is not present");
|
||||
mActivity.onDeviceSelected(null);
|
||||
return;
|
||||
}
|
||||
|
||||
mActivity.getSupportActionBar().setTitle(device.getName());
|
||||
|
||||
device.addPairingCallback(pairingCallback);
|
||||
device.addPluginsChangedListener(pluginsChangedListener);
|
||||
|
||||
refreshUI();
|
||||
|
||||
});
|
||||
|
||||
final Button pairButton = (Button) rootView.findViewById(R.id.pair_button);
|
||||
pairButton.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View view) {
|
||||
pairButton.setVisibility(View.GONE);
|
||||
((TextView) rootView.findViewById(R.id.pair_message)).setText("");
|
||||
rootView.findViewById(R.id.pair_progress).setVisibility(View.VISIBLE);
|
||||
BackgroundService.RunCommand(mActivity, new BackgroundService.InstanceCallback() {
|
||||
@Override
|
||||
public void onServiceStart(BackgroundService service) {
|
||||
device = service.getDevice(deviceId);
|
||||
if (device == null) return;
|
||||
device.requestPairing();
|
||||
}
|
||||
});
|
||||
}
|
||||
pairButton.setOnClickListener(view -> {
|
||||
pairButton.setVisibility(View.GONE);
|
||||
((TextView) rootView.findViewById(R.id.pair_message)).setText("");
|
||||
rootView.findViewById(R.id.pair_progress).setVisibility(View.VISIBLE);
|
||||
BackgroundService.RunCommand(mActivity, service -> {
|
||||
device = service.getDevice(deviceId);
|
||||
if (device == null) return;
|
||||
device.requestPairing();
|
||||
});
|
||||
});
|
||||
|
||||
rootView.findViewById(R.id.accept_button).setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View view) {
|
||||
BackgroundService.RunCommand(mActivity, new BackgroundService.InstanceCallback() {
|
||||
@Override
|
||||
public void onServiceStart(BackgroundService service) {
|
||||
if (device != null) {
|
||||
device.acceptPairing();
|
||||
rootView.findViewById(R.id.pairing_buttons).setVisibility(View.GONE);
|
||||
}
|
||||
}
|
||||
});
|
||||
rootView.findViewById(R.id.accept_button).setOnClickListener(view -> BackgroundService.RunCommand(mActivity, service -> {
|
||||
if (device != null) {
|
||||
device.acceptPairing();
|
||||
rootView.findViewById(R.id.pairing_buttons).setVisibility(View.GONE);
|
||||
}
|
||||
});
|
||||
}));
|
||||
|
||||
rootView.findViewById(R.id.reject_button).setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View view) {
|
||||
BackgroundService.RunCommand(mActivity, new BackgroundService.InstanceCallback() {
|
||||
@Override
|
||||
public void onServiceStart(BackgroundService service) {
|
||||
if (device != null) {
|
||||
//Remove listener so buttons don't show for a while before changing the view
|
||||
device.removePluginsChangedListener(pluginsChangedListener);
|
||||
device.removePairingCallback(pairingCallback);
|
||||
device.rejectPairing();
|
||||
}
|
||||
mActivity.onDeviceSelected(null);
|
||||
}
|
||||
});
|
||||
rootView.findViewById(R.id.reject_button).setOnClickListener(view -> BackgroundService.RunCommand(mActivity, service -> {
|
||||
if (device != null) {
|
||||
//Remove listener so buttons don't show for a while before changing the view
|
||||
device.removePluginsChangedListener(pluginsChangedListener);
|
||||
device.removePairingCallback(pairingCallback);
|
||||
device.rejectPairing();
|
||||
}
|
||||
});
|
||||
mActivity.onDeviceSelected(null);
|
||||
}));
|
||||
|
||||
return rootView;
|
||||
}
|
||||
|
||||
final Device.PluginsChangedListener pluginsChangedListener = new Device.PluginsChangedListener() {
|
||||
@Override
|
||||
public void onPluginsChanged(final Device device) {
|
||||
refreshUI();
|
||||
}
|
||||
};
|
||||
final Device.PluginsChangedListener pluginsChangedListener = device -> refreshUI();
|
||||
|
||||
@Override
|
||||
public void onDestroyView() {
|
||||
BackgroundService.RunCommand(mActivity, new BackgroundService.InstanceCallback() {
|
||||
@Override
|
||||
public void onServiceStart(BackgroundService service) {
|
||||
Device device = service.getDevice(mDeviceId);
|
||||
if (device == null) return;
|
||||
device.removePluginsChangedListener(pluginsChangedListener);
|
||||
device.removePairingCallback(pairingCallback);
|
||||
}
|
||||
BackgroundService.RunCommand(mActivity, service -> {
|
||||
Device device = service.getDevice(mDeviceId);
|
||||
if (device == null) return;
|
||||
device.removePluginsChangedListener(pluginsChangedListener);
|
||||
device.removePairingCallback(pairingCallback);
|
||||
});
|
||||
super.onDestroyView();
|
||||
}
|
||||
@@ -223,63 +190,47 @@ public class DeviceFragment extends Fragment {
|
||||
if (!p.displayInContextMenu()) {
|
||||
continue;
|
||||
}
|
||||
menu.add(p.getActionName()).setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
|
||||
@Override
|
||||
public boolean onMenuItemClick(MenuItem item) {
|
||||
p.startMainActivity(mActivity);
|
||||
return true;
|
||||
}
|
||||
menu.add(p.getActionName()).setOnMenuItemClickListener(item -> {
|
||||
p.startMainActivity(mActivity);
|
||||
return true;
|
||||
});
|
||||
}
|
||||
|
||||
menu.add(R.string.device_menu_plugins).setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
|
||||
@Override
|
||||
public boolean onMenuItemClick(MenuItem menuItem) {
|
||||
Intent intent = new Intent(mActivity, SettingsActivity.class);
|
||||
intent.putExtra("deviceId", mDeviceId);
|
||||
startActivity(intent);
|
||||
return true;
|
||||
}
|
||||
menu.add(R.string.device_menu_plugins).setOnMenuItemClickListener(menuItem -> {
|
||||
Intent intent = new Intent(mActivity, SettingsActivity.class);
|
||||
intent.putExtra("deviceId", mDeviceId);
|
||||
startActivity(intent);
|
||||
return true;
|
||||
});
|
||||
|
||||
if (device.isReachable()) {
|
||||
|
||||
menu.add(R.string.encryption_info_title).setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
|
||||
@Override
|
||||
public boolean onMenuItemClick(MenuItem menuItem) {
|
||||
Context context = mActivity;
|
||||
AlertDialog.Builder builder = new AlertDialog.Builder(context);
|
||||
builder.setTitle(context.getResources().getString(R.string.encryption_info_title));
|
||||
builder.setPositiveButton(context.getResources().getString(R.string.ok), new DialogInterface.OnClickListener() {
|
||||
public void onClick(DialogInterface dialog, int id) {
|
||||
dialog.dismiss();
|
||||
}
|
||||
});
|
||||
menu.add(R.string.encryption_info_title).setOnMenuItemClickListener(menuItem -> {
|
||||
Context context = mActivity;
|
||||
AlertDialog.Builder builder = new AlertDialog.Builder(context);
|
||||
builder.setTitle(context.getResources().getString(R.string.encryption_info_title));
|
||||
builder.setPositiveButton(context.getResources().getString(R.string.ok), (dialog, id) -> dialog.dismiss());
|
||||
|
||||
if (device.certificate == null) {
|
||||
builder.setMessage(R.string.encryption_info_msg_no_ssl);
|
||||
} else {
|
||||
builder.setMessage(context.getResources().getString(R.string.my_device_fingerprint) + "\n" + SslHelper.getCertificateHash(SslHelper.certificate) + "\n\n"
|
||||
+ context.getResources().getString(R.string.remote_device_fingerprint) + "\n" + SslHelper.getCertificateHash(device.certificate));
|
||||
}
|
||||
builder.create().show();
|
||||
return true;
|
||||
if (device.certificate == null) {
|
||||
builder.setMessage(R.string.encryption_info_msg_no_ssl);
|
||||
} else {
|
||||
builder.setMessage(context.getResources().getString(R.string.my_device_fingerprint) + "\n" + SslHelper.getCertificateHash(SslHelper.certificate) + "\n\n"
|
||||
+ context.getResources().getString(R.string.remote_device_fingerprint) + "\n" + SslHelper.getCertificateHash(device.certificate));
|
||||
}
|
||||
builder.create().show();
|
||||
return true;
|
||||
});
|
||||
}
|
||||
|
||||
if (device.isPaired()) {
|
||||
|
||||
menu.add(R.string.device_menu_unpair).setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
|
||||
@Override
|
||||
public boolean onMenuItemClick(MenuItem menuItem) {
|
||||
//Remove listener so buttons don't show for a while before changing the view
|
||||
device.removePluginsChangedListener(pluginsChangedListener);
|
||||
device.removePairingCallback(pairingCallback);
|
||||
device.unpair();
|
||||
mActivity.onDeviceSelected(null);
|
||||
return true;
|
||||
}
|
||||
menu.add(R.string.device_menu_unpair).setOnMenuItemClickListener(menuItem -> {
|
||||
//Remove listener so buttons don't show for a while before changing the view
|
||||
device.removePluginsChangedListener(pluginsChangedListener);
|
||||
device.removePairingCallback(pairingCallback);
|
||||
device.unpair();
|
||||
mActivity.onDeviceSelected(null);
|
||||
return true;
|
||||
});
|
||||
}
|
||||
|
||||
@@ -291,19 +242,16 @@ public class DeviceFragment extends Fragment {
|
||||
|
||||
getView().setFocusableInTouchMode(true);
|
||||
getView().requestFocus();
|
||||
getView().setOnKeyListener(new View.OnKeyListener() {
|
||||
@Override
|
||||
public boolean onKey(View v, int keyCode, KeyEvent event) {
|
||||
if (event.getAction() == KeyEvent.ACTION_UP && keyCode == KeyEvent.KEYCODE_BACK) {
|
||||
boolean fromDeviceList = getArguments().getBoolean(ARG_FROM_DEVICE_LIST, false);
|
||||
// Handle back button so we go to the list of devices in case we came from there
|
||||
if (fromDeviceList) {
|
||||
mActivity.onDeviceSelected(null);
|
||||
return true;
|
||||
}
|
||||
getView().setOnKeyListener((v, keyCode, event) -> {
|
||||
if (event.getAction() == KeyEvent.ACTION_UP && keyCode == KeyEvent.KEYCODE_BACK) {
|
||||
boolean fromDeviceList = getArguments().getBoolean(ARG_FROM_DEVICE_LIST, false);
|
||||
// Handle back button so we go to the list of devices in case we came from there
|
||||
if (fromDeviceList) {
|
||||
mActivity.onDeviceSelected(null);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
return false;
|
||||
});
|
||||
}
|
||||
|
||||
@@ -347,12 +295,7 @@ public class DeviceFragment extends Fragment {
|
||||
if (!p.hasMainActivity()) continue;
|
||||
if (p.displayInContextMenu()) continue;
|
||||
|
||||
pluginListItems.add(new PluginItem(p, new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
p.startMainActivity(mActivity);
|
||||
}
|
||||
}));
|
||||
pluginListItems.add(new PluginItem(p, v -> p.startMainActivity(mActivity)));
|
||||
}
|
||||
|
||||
createPluginsList(device.getFailedPlugins(), R.string.plugins_failed_to_load, new PluginClickListener() {
|
||||
@@ -408,31 +351,25 @@ public class DeviceFragment extends Fragment {
|
||||
|
||||
@Override
|
||||
public void pairingFailed(final String error) {
|
||||
mActivity.runOnUiThread(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
if (rootView == null) return;
|
||||
((TextView) rootView.findViewById(R.id.pair_message)).setText(error);
|
||||
rootView.findViewById(R.id.pair_progress).setVisibility(View.GONE);
|
||||
rootView.findViewById(R.id.pair_button).setVisibility(View.VISIBLE);
|
||||
rootView.findViewById(R.id.pair_request).setVisibility(View.GONE);
|
||||
refreshUI();
|
||||
}
|
||||
mActivity.runOnUiThread(() -> {
|
||||
if (rootView == null) return;
|
||||
((TextView) rootView.findViewById(R.id.pair_message)).setText(error);
|
||||
rootView.findViewById(R.id.pair_progress).setVisibility(View.GONE);
|
||||
rootView.findViewById(R.id.pair_button).setVisibility(View.VISIBLE);
|
||||
rootView.findViewById(R.id.pair_request).setVisibility(View.GONE);
|
||||
refreshUI();
|
||||
});
|
||||
}
|
||||
|
||||
@Override
|
||||
public void unpaired() {
|
||||
mActivity.runOnUiThread(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
if (rootView == null) return;
|
||||
((TextView) rootView.findViewById(R.id.pair_message)).setText(R.string.device_not_paired);
|
||||
rootView.findViewById(R.id.pair_progress).setVisibility(View.GONE);
|
||||
rootView.findViewById(R.id.pair_button).setVisibility(View.VISIBLE);
|
||||
rootView.findViewById(R.id.pair_request).setVisibility(View.GONE);
|
||||
refreshUI();
|
||||
}
|
||||
mActivity.runOnUiThread(() -> {
|
||||
if (rootView == null) return;
|
||||
((TextView) rootView.findViewById(R.id.pair_message)).setText(R.string.device_not_paired);
|
||||
rootView.findViewById(R.id.pair_progress).setVisibility(View.GONE);
|
||||
rootView.findViewById(R.id.pair_button).setVisibility(View.VISIBLE);
|
||||
rootView.findViewById(R.id.pair_request).setVisibility(View.GONE);
|
||||
refreshUI();
|
||||
});
|
||||
}
|
||||
|
||||
@@ -440,51 +377,47 @@ public class DeviceFragment extends Fragment {
|
||||
|
||||
public static void acceptPairing(final String devId, final MainActivity activity) {
|
||||
final DeviceFragment frag = new DeviceFragment(devId, activity);
|
||||
BackgroundService.RunCommand(activity, new BackgroundService.InstanceCallback() {
|
||||
public void onServiceStart(BackgroundService service) {
|
||||
Device dev = service.getDevice(devId);
|
||||
if (dev == null) {
|
||||
Log.w("rejectPairing", "Device no longer exists: " + devId);
|
||||
return;
|
||||
}
|
||||
activity.getSupportActionBar().setTitle(dev.getName());
|
||||
|
||||
dev.addPairingCallback(frag.pairingCallback);
|
||||
dev.addPluginsChangedListener(frag.pluginsChangedListener);
|
||||
|
||||
frag.device = dev;
|
||||
frag.device.acceptPairing();
|
||||
|
||||
frag.refreshUI();
|
||||
|
||||
BackgroundService.RunCommand(activity, service -> {
|
||||
Device dev = service.getDevice(devId);
|
||||
if (dev == null) {
|
||||
Log.w("rejectPairing", "Device no longer exists: " + devId);
|
||||
return;
|
||||
}
|
||||
activity.getSupportActionBar().setTitle(dev.getName());
|
||||
|
||||
dev.addPairingCallback(frag.pairingCallback);
|
||||
dev.addPluginsChangedListener(frag.pluginsChangedListener);
|
||||
|
||||
frag.device = dev;
|
||||
frag.device.acceptPairing();
|
||||
|
||||
frag.refreshUI();
|
||||
|
||||
});
|
||||
}
|
||||
|
||||
public static void rejectPairing(final String devId, final MainActivity activity) {
|
||||
final DeviceFragment frag = new DeviceFragment(devId, activity);
|
||||
BackgroundService.RunCommand(activity, new BackgroundService.InstanceCallback() {
|
||||
public void onServiceStart(BackgroundService service) {
|
||||
Device dev = service.getDevice(devId);
|
||||
if (dev == null) {
|
||||
Log.w("rejectPairing", "Device no longer exists: " + devId);
|
||||
return;
|
||||
}
|
||||
activity.getSupportActionBar().setTitle(dev.getName());
|
||||
|
||||
dev.addPairingCallback(frag.pairingCallback);
|
||||
dev.addPluginsChangedListener(frag.pluginsChangedListener);
|
||||
|
||||
frag.device = dev;
|
||||
|
||||
//Remove listener so buttons don't show for a while before changing the view
|
||||
frag.device.removePluginsChangedListener(frag.pluginsChangedListener);
|
||||
frag.device.removePairingCallback(frag.pairingCallback);
|
||||
frag.device.rejectPairing();
|
||||
activity.onDeviceSelected(null);
|
||||
|
||||
frag.refreshUI();
|
||||
BackgroundService.RunCommand(activity, service -> {
|
||||
Device dev = service.getDevice(devId);
|
||||
if (dev == null) {
|
||||
Log.w("rejectPairing", "Device no longer exists: " + devId);
|
||||
return;
|
||||
}
|
||||
activity.getSupportActionBar().setTitle(dev.getName());
|
||||
|
||||
dev.addPairingCallback(frag.pairingCallback);
|
||||
dev.addPluginsChangedListener(frag.pluginsChangedListener);
|
||||
|
||||
frag.device = dev;
|
||||
|
||||
//Remove listener so buttons don't show for a while before changing the view
|
||||
frag.device.removePluginsChangedListener(frag.pluginsChangedListener);
|
||||
frag.device.removePairingCallback(frag.pairingCallback);
|
||||
frag.device.rejectPairing();
|
||||
activity.onDeviceSelected(null);
|
||||
|
||||
frag.refreshUI();
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user