From 268e658e6fe512580e3057782257ba6afe396ccb Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Thu, 23 Jul 2015 12:09:01 +0200
Subject: [PATCH] rename ACTION_INSTALL_PEBBLEAPP to ACTION_INSTALL

---
 .../gadgetbridge/BluetoothCommunicationService.java    | 10 +++++-----
 .../pebble/PebbleAppInstallerActivity.java             |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/BluetoothCommunicationService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/BluetoothCommunicationService.java
index 742c6331b..c14bbee65 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/BluetoothCommunicationService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/BluetoothCommunicationService.java
@@ -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;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/pebble/PebbleAppInstallerActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/pebble/PebbleAppInstallerActivity.java
index ce0bca6c6..f6b978794 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/pebble/PebbleAppInstallerActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/pebble/PebbleAppInstallerActivity.java
@@ -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);
             }
         });