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

Fixed pairing requests not being displayed after clicking the notification

Browse Source
This commit is contained in:
Albert Vaca
2015-09-12 13:21:06 -07:00
parent 6b18c2f28e
commit 24ca5f706a
3 changed files with 112 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/org/kde/kdeconnect/BackgroundService.java
View File

@@ -77,11 +77,11 @@ public class BackgroundService extends Service {
} }
} }
public static void addGuiInUseCounter(Activity activity) { public static void addGuiInUseCounter(Context activity) {
addGuiInUseCounter(activity, false); addGuiInUseCounter(activity, false);
} }
public static void addGuiInUseCounter(final Activity activity, final boolean forceNetworkRefresh) { public static void addGuiInUseCounter(final Context activity, final boolean forceNetworkRefresh) {
BackgroundService.RunCommand(activity, new BackgroundService.InstanceCallback() { BackgroundService.RunCommand(activity, new BackgroundService.InstanceCallback() {
@Override @Override
public void onServiceStart(BackgroundService service) { public void onServiceStart(BackgroundService service) {
@@ -93,7 +93,7 @@ public class BackgroundService extends Service {
}); });
} }
public static void removeGuiInUseCounter(final Activity activity) { public static void removeGuiInUseCounter(final Context activity) {
BackgroundService.RunCommand(activity, new BackgroundService.InstanceCallback() { BackgroundService.RunCommand(activity, new BackgroundService.InstanceCallback() {
@Override @Override
public void onServiceStart(BackgroundService service) { public void onServiceStart(BackgroundService service) {
@@ -162,7 +162,7 @@ public class BackgroundService extends Service {
private void cleanDevices() { private void cleanDevices() {
for(Device d : devices.values()) { for(Device d : devices.values()) {
if (!d.isPaired()) { if (!d.isPaired() && !d.isPairRequested() && !d.isPairRequestedByOtherEnd() && d.getConnectionSource() == BaseLink.ConnectionStarted.Remotely) {
d.disconnect(); d.disconnect();
} }
} }
@@ -182,9 +182,14 @@ public class BackgroundService extends Service {
} else { } else {
Log.i("KDE/BackgroundService", "addLink,unknown device: " + deviceId); Log.i("KDE/BackgroundService", "addLink,unknown device: " + deviceId);
device = new Device(BackgroundService.this, identityPackage, link); device = new Device(BackgroundService.this, identityPackage, link);
if (device.isPaired() || !discoveryModeAcquisitions.isEmpty()) { if (device.isPaired() || device.isPairRequested() || device.isPairRequestedByOtherEnd()
|| link.getConnectionSource() == BaseLink.ConnectionStarted.Locally
||!discoveryModeAcquisitions.isEmpty() )
{
devices.put(deviceId, device); devices.put(deviceId, device);
device.addPairingCallback(devicePairingCallback); device.addPairingCallback(devicePairingCallback);
} else {
device.disconnect();
} }
} }
@@ -197,7 +202,7 @@ public class BackgroundService extends Service {
Log.i("KDE/onConnectionLost", "removeLink, deviceId: " + link.getDeviceId()); Log.i("KDE/onConnectionLost", "removeLink, deviceId: " + link.getDeviceId());
if (d != null) { if (d != null) {
d.removeLink(link); d.removeLink(link);
if (!d.isReachable() && !d.isPaired() && (link.getConnectionSource() == BaseLink.ConnectionStarted.Locally)) { if (!d.isReachable() && !d.isPaired()) {
//Log.e("onConnectionLost","Removing connection device because it was not paired"); //Log.e("onConnectionLost","Removing connection device because it was not paired");
devices.remove(link.getDeviceId()); devices.remove(link.getDeviceId());
d.removePairingCallback(devicePairingCallback); d.removePairingCallback(devicePairingCallback);

51
src/org/kde/kdeconnect/Device.java
View File

@@ -203,11 +203,12 @@ public class Device implements BaseLink.PackageReceiver {
return pairStatus == PairStatus.Requested; return pairStatus == PairStatus.Requested;
} }
public boolean isPairRequestedByOtherEnd() {
return pairStatus == PairStatus.RequestedByPeer;
}
public void addPairingCallback(PairingCallback callback) { public void addPairingCallback(PairingCallback callback) {
pairingCallback.add(callback); pairingCallback.add(callback);
if (pairStatus == PairStatus.RequestedByPeer) {
callback.incomingRequest();
}
} }
public void removePairingCallback(PairingCallback callback) { public void removePairingCallback(PairingCallback callback) {
pairingCallback.remove(callback); pairingCallback.remove(callback);
@@ -245,10 +246,10 @@ public class Device implements BaseLink.PackageReceiver {
//Send our own public key //Send our own public key
NetworkPackage np = NetworkPackage.createPublicKeyPackage(context); NetworkPackage np = NetworkPackage.createPublicKeyPackage(context);
sendPackage(np, new SendPackageStatusCallback(){ sendPackage(np, new SendPackageStatusCallback() {
@Override @Override
public void onSuccess() { public void onSuccess() {
if (pairingTimer != null) pairingTimer.cancel(); hidePairingNotification(); //Will stop the pairingTimer if it was running
pairingTimer = new Timer(); pairingTimer = new Timer();
pairingTimer.schedule(new TimerTask() { pairingTimer.schedule(new TimerTask() {
@Override @Override
@@ -256,10 +257,10 @@ public class Device implements BaseLink.PackageReceiver {
for (PairingCallback cb : pairingCallback) { for (PairingCallback cb : pairingCallback) {
cb.pairingFailed(context.getString(R.string.error_timed_out)); cb.pairingFailed(context.getString(R.string.error_timed_out));
} }
Log.e("KDE/Device","Unpairing (timeout A)"); Log.e("KDE/Device", "Unpairing (timeout A)");
pairStatus = PairStatus.NotPaired; pairStatus = PairStatus.NotPaired;
} }
}, 30*1000); //Time to wait for the other to accept }, 30 * 1000); //Time to wait for the other to accept
pairStatus = PairStatus.Requested; pairStatus = PairStatus.Requested;
} }
@@ -268,7 +269,7 @@ public class Device implements BaseLink.PackageReceiver {
for (PairingCallback cb : pairingCallback) { for (PairingCallback cb : pairingCallback) {
cb.pairingFailed(context.getString(R.string.error_could_not_send_package)); cb.pairingFailed(context.getString(R.string.error_could_not_send_package));
} }
Log.e("KDE/Device","Unpairing (sendFailed A)"); Log.e("KDE/Device", "Unpairing (sendFailed A)");
pairStatus = PairStatus.NotPaired; pairStatus = PairStatus.NotPaired;
} }
@@ -276,8 +277,13 @@ public class Device implements BaseLink.PackageReceiver {
} }
public int getNotificationId() { public void hidePairingNotification() {
return notificationId; NotificationManager notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
notificationManager.cancel(notificationId);
if (pairingTimer != null) {
pairingTimer.cancel();
}
BackgroundService.removeGuiInUseCounter(context);
} }
public void unpair() { public void unpair() {
@@ -302,7 +308,7 @@ public class Device implements BaseLink.PackageReceiver {
//Log.e("Device", "Storing as trusted, deviceId: "+deviceId); //Log.e("Device", "Storing as trusted, deviceId: "+deviceId);
if (pairingTimer != null) pairingTimer.cancel(); hidePairingNotification();
pairStatus = PairStatus.Paired; pairStatus = PairStatus.Paired;
@@ -448,7 +454,7 @@ public class Device implements BaseLink.PackageReceiver {
if (pairStatus == PairStatus.Requested) { if (pairStatus == PairStatus.Requested) {
//Log.e("Device","Unpairing (pair rejected)"); //Log.e("Device","Unpairing (pair rejected)");
pairStatus = PairStatus.NotPaired; pairStatus = PairStatus.NotPaired;
if (pairingTimer != null) pairingTimer.cancel(); hidePairingNotification();
for (PairingCallback cb : pairingCallback) { for (PairingCallback cb : pairingCallback) {
cb.pairingFailed(context.getString(R.string.error_canceled_by_other_peer)); cb.pairingFailed(context.getString(R.string.error_canceled_by_other_peer));
} }
@@ -476,7 +482,7 @@ public class Device implements BaseLink.PackageReceiver {
Log.i("KDE/Pairing","Pair answer"); Log.i("KDE/Pairing","Pair answer");
if (pairingTimer != null) pairingTimer.cancel(); hidePairingNotification();
pairingDone(); pairingDone();
@@ -490,6 +496,8 @@ public class Device implements BaseLink.PackageReceiver {
Resources res = context.getResources(); Resources res = context.getResources();
hidePairingNotification();
Notification noti = new NotificationCompat.Builder(context) Notification noti = new NotificationCompat.Builder(context)
.setContentTitle(res.getString(R.string.pairing_request_from, getName())) .setContentTitle(res.getString(R.string.pairing_request_from, getName()))
.setContentText(res.getString(R.string.tap_to_answer)) .setContentText(res.getString(R.string.tap_to_answer))
@@ -504,21 +512,20 @@ public class Device implements BaseLink.PackageReceiver {
final NotificationManager notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE); final NotificationManager notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
notificationId = (int)System.currentTimeMillis(); notificationId = (int)System.currentTimeMillis();
try { try {
BackgroundService.addGuiInUseCounter(context);
notificationManager.notify(notificationId, noti); notificationManager.notify(notificationId, noti);
} catch(Exception e) { } catch(Exception e) {
//4.1 will throw an exception about not having the VIBRATE permission, ignore it. //4.1 will throw an exception about not having the VIBRATE permission, ignore it.
//https://android.googlesource.com/platform/frameworks/base/+/android-4.2.1_r1.2%5E%5E!/ //https://android.googlesource.com/platform/frameworks/base/+/android-4.2.1_r1.2%5E%5E!/
} }
if (pairingTimer != null) pairingTimer.cancel();
pairingTimer = new Timer(); pairingTimer = new Timer();
pairingTimer.schedule(new TimerTask() { pairingTimer.schedule(new TimerTask() {
@Override @Override
public void run() { public void run() {
Log.e("KDE/Device","Unpairing (timeout B)"); Log.e("KDE/Device","Unpairing (timeout B)");
hidePairingNotification();
pairStatus = PairStatus.NotPaired; pairStatus = PairStatus.NotPaired;
notificationManager.cancel(notificationId);
} }
}, 25*1000); //Time to show notification, waiting for user to accept (peer will timeout in 30 seconds) }, 25*1000); //Time to show notification, waiting for user to accept (peer will timeout in 30 seconds)
pairStatus = PairStatus.RequestedByPeer; pairStatus = PairStatus.RequestedByPeer;
@@ -529,7 +536,7 @@ public class Device implements BaseLink.PackageReceiver {
Log.i("KDE/Pairing","Unpair request"); Log.i("KDE/Pairing","Unpair request");
if (pairStatus == PairStatus.Requested) { if (pairStatus == PairStatus.Requested) {
pairingTimer.cancel(); hidePairingNotification();
for (PairingCallback cb : pairingCallback) { for (PairingCallback cb : pairingCallback) {
cb.pairingFailed(context.getString(R.string.error_canceled_by_other_peer)); cb.pairingFailed(context.getString(R.string.error_canceled_by_other_peer));
} }
@@ -805,4 +812,14 @@ public class Device implements BaseLink.PackageReceiver {
link.disconnect(); link.disconnect();
} }
} }
public BaseLink.ConnectionStarted getConnectionSource() {
for(BaseLink l : links) {
if (l.getConnectionSource() == BaseLink.ConnectionStarted.Locally) {
return BaseLink.ConnectionStarted.Locally;
}
}
return BaseLink.ConnectionStarted.Remotely;
}
} }

132
src/org/kde/kdeconnect/UserInterface/DeviceFragment.java
View File

@@ -293,73 +293,85 @@ public class DeviceFragment extends Fragment {
return; return;
} }
//Once in-app, there is no point in keep displaying the notification if any
device.hidePairingNotification();
mActivity.runOnUiThread(new Runnable() { mActivity.runOnUiThread(new Runnable() {
@Override @Override
public void run() { public void run() {
boolean paired = device.isPaired(); Log.e("DEVICE",device.getName() + device.isPairRequestedByOtherEnd() + device.isPairRequested());
boolean reachable = device.isReachable(); if (device.isPairRequestedByOtherEnd()) {
((TextView) rootView.findViewById(R.id.pair_message)).setText(R.string.pair_requested);
rootView.findViewById(R.id.pair_progress).setVisibility(View.GONE);
rootView.findViewById(R.id.pair_button).setVisibility(View.GONE);
rootView.findViewById(R.id.pair_request).setVisibility(View.VISIBLE);
} else {
rootView.findViewById(R.id.pairing_buttons).setVisibility(paired ? View.GONE : View.VISIBLE); boolean paired = device.isPaired();
rootView.findViewById(R.id.unpair_message).setVisibility((paired && !reachable) ? View.VISIBLE : View.GONE); boolean reachable = device.isReachable();
try { rootView.findViewById(R.id.pairing_buttons).setVisibility(paired ? View.GONE : View.VISIBLE);
ArrayList<ListAdapter.Item> items = new ArrayList<>(); rootView.findViewById(R.id.unpair_message).setVisibility((paired && !reachable) ? View.VISIBLE : View.GONE);
//Plugins button list try {
final Collection<Plugin> plugins = device.getLoadedPlugins().values(); ArrayList<ListAdapter.Item> items = new ArrayList<>();
for (final Plugin p : plugins) {
if (!p.hasMainActivity()) continue;
if (p.displayInContextMenu()) continue;
items.add(new PluginItem(p, new View.OnClickListener() { //Plugins button list
@Override final Collection<Plugin> plugins = device.getLoadedPlugins().values();
public void onClick(View v) { for (final Plugin p : plugins) {
p.startMainActivity(mActivity); if (!p.hasMainActivity()) continue;
if (p.displayInContextMenu()) continue;
items.add(new PluginItem(p, new View.OnClickListener() {
@Override
public void onClick(View v) {
p.startMainActivity(mActivity);
}
}));
} }
}));
}
//Failed plugins List //Failed plugins List
final Collection<Plugin> failed = device.getFailedPlugins().values(); final Collection<Plugin> failed = device.getFailedPlugins().values();
if (!failed.isEmpty()) { if (!failed.isEmpty()) {
if (errorHeader == null) { if (errorHeader == null) {
errorHeader = new TextView(mActivity); errorHeader = new TextView(mActivity);
errorHeader.setPadding( errorHeader.setPadding(
0, 0,
((int) (28 * getResources().getDisplayMetrics().density)), ((int) (28 * getResources().getDisplayMetrics().density)),
0, 0,
((int) (8 * getResources().getDisplayMetrics().density)) ((int) (8 * getResources().getDisplayMetrics().density))
); );
errorHeader.setOnClickListener(null); errorHeader.setOnClickListener(null);
errorHeader.setOnLongClickListener(null); errorHeader.setOnLongClickListener(null);
errorHeader.setText(getResources().getString(R.string.plugins_failed_to_load)); errorHeader.setText(getResources().getString(R.string.plugins_failed_to_load));
}
items.add(new CustomItem(errorHeader));
for (final Plugin p : failed) {
items.add(new SmallEntryItem(p.getDisplayName(), new View.OnClickListener() {
@Override
public void onClick(View v) {
p.getErrorDialog(mActivity).show();
} }
})); items.add(new CustomItem(errorHeader));
for (final Plugin p : failed) {
items.add(new SmallEntryItem(p.getDisplayName(), new View.OnClickListener() {
@Override
public void onClick(View v) {
p.getErrorDialog(mActivity).show();
}
}));
}
}
ListView buttonsList = (ListView) rootView.findViewById(R.id.buttons_list);
ListAdapter adapter = new ListAdapter(mActivity, items);
buttonsList.setAdapter(adapter);
mActivity.invalidateOptionsMenu();
} catch (IllegalStateException e) {
e.printStackTrace();
//Ignore: The activity was closed while we were trying to update it
} catch (ConcurrentModificationException e) {
Log.e("DeviceActivity", "ConcurrentModificationException");
this.run(); //Try again
} }
} }
ListView buttonsList = (ListView) rootView.findViewById(R.id.buttons_list);
ListAdapter adapter = new ListAdapter(mActivity, items);
buttonsList.setAdapter(adapter);
mActivity.invalidateOptionsMenu();
} catch (IllegalStateException e) {
e.printStackTrace();
//Ignore: The activity was closed while we were trying to update it
} catch (ConcurrentModificationException e) {
Log.e("DeviceActivity", "ConcurrentModificationException");
this.run(); //Try again
}
} }
}); });
@@ -369,17 +381,7 @@ public class DeviceFragment extends Fragment {
@Override @Override
public void incomingRequest() { public void incomingRequest() {
mActivity.runOnUiThread(new Runnable() { refreshUI();
@Override
public void run() {
((TextView) rootView.findViewById(R.id.pair_message)).setText(R.string.pair_requested);
rootView.findViewById(R.id.pair_progress).setVisibility(View.GONE);
rootView.findViewById(R.id.pair_button).setVisibility(View.GONE);
rootView.findViewById(R.id.pair_request).setVisibility(View.VISIBLE);
}
});
NotificationManager notificationManager = (NotificationManager) mActivity.getSystemService(Context.NOTIFICATION_SERVICE);
notificationManager.cancel(device.getNotificationId());
} }
@Override @Override