nixo
/
GadgetBridge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rename ACTION_INSTALL_PEBBLEAPP to ACTION_INSTALL

master
Andreas Shimokawa 2015-07-23 12:09:01 +02:00
parent 5c26b2281f
commit 268e658e6f
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/BluetoothCommunicationService.java
View File

@ -55,8 +55,8 @@ public class BluetoothCommunicationService extends Service {
= "nodomain.freeyourgadget.gadgetbridge.bluetoothcommunicationservice.action.startapp";
public static final String ACTION_DELETEAPP
= "nodomain.freeyourgadget.gadgetbridge.bluetoothcommunicationservice.action.deleteapp";
public static final String ACTION_INSTALL_PEBBLEAPP
= "nodomain.freeyourgadget.gadgetbridge.bluetoothcommunicationservice.action.install_pebbbleapp";
public static final String ACTION_INSTALL
= "nodomain.freeyourgadget.gadgetbridge.bluetoothcommunicationservice.action.install";
public static final String ACTION_REBOOT = "nodomain.freeyourgadget.gadgetbridge.bluetoothcommunicationservice.action.reboot";
public static final String ACTION_FETCH_ACTIVITY_DATA = "nodomain.freeyourgadget.gadgetbridge.bluetoothcommunicationservice.action.fetch_activity_data";
public static final String ACTION_DISCONNECT = "nodomain.freeyourgadget.gadgetbridge.bluetoothcommunicationservice.action.disconnect";
@ -258,10 +258,10 @@ public class BluetoothCommunicationService extends Service {
uuid = UUID.fromString(intent.getStringExtra("app_uuid"));
mDeviceSupport.onAppDelete(uuid);
break;
case ACTION_INSTALL_PEBBLEAPP:
String uriString = intent.getStringExtra("app_uri");
case ACTION_INSTALL:
String uriString = intent.getStringExtra("uri");
if (uriString != null) {
LOG.info("will try to install app");
LOG.info("will try to install app/fw");
mDeviceSupport.onInstallApp(Uri.parse(uriString));
}
break;

4
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/pebble/PebbleAppInstallerActivity.java
View File

@ -84,8 +84,8 @@ public class PebbleAppInstallerActivity extends Activity {
@Override
public void onClick(View v) {
Intent startIntent = new Intent(PebbleAppInstallerActivity.this, BluetoothCommunicationService.class);
startIntent.setAction(BluetoothCommunicationService.ACTION_INSTALL_PEBBLEAPP);
startIntent.putExtra("app_uri", uri.toString());
startIntent.setAction(BluetoothCommunicationService.ACTION_INSTALL);
startIntent.putExtra("uri", uri.toString());
startService(startIntent);
}
});