Pebble: Remove firmware 1.x and 2.x support

All pebbles ever released support Firmware >=3.x And it got really old by now
2026-07-31 07:44:24 +02:00 · 2025-10-31 13:58:28 +01:00
parent 25cc9294be
commit 75035f26c3
7 changed files with 112 additions and 292 deletions
@@ -1831,7 +1831,6 @@ public class GBApplication extends Application {
                        deviceSharedPrefsEdit.putBoolean("pebble_health_store_raw", sharedPrefs.getBoolean("pebble_health_store_raw", true));
                        deviceSharedPrefsEdit.putBoolean("pebble_sync_misfit", sharedPrefs.getBoolean("pebble_sync_misfit", true));
                        deviceSharedPrefsEdit.putBoolean("pebble_sync_morpheuz", sharedPrefs.getBoolean("pebble_sync_morpheuz", true));
-                        deviceSharedPrefsEdit.putBoolean("pebble_force_protocol", sharedPrefs.getBoolean("pebble_force_protocol", false));
                        deviceSharedPrefsEdit.putBoolean("pebble_force_untested", sharedPrefs.getBoolean("pebble_force_untested", false));
                        deviceSharedPrefsEdit.putBoolean("pebble_force_le", sharedPrefs.getBoolean("pebble_force_le", false));
                        deviceSharedPrefsEdit.putString("pebble_mtu_limit", sharedPrefs.getString("pebble_mtu_limit", "512"));
@@ -157,18 +157,12 @@ public class PebbleCoordinator extends AbstractBLClassicDeviceCoordinator {

    @Override
    public boolean supportsAppListFetching(final GBDevice device) {
-        if (device.getFirmwareVersion() != null) {
-            return PebbleUtils.getFwMajor(device.getFirmwareVersion()) < 3;
-        }
        return false;
    }

    @Override
    public boolean supportsAppReordering(final GBDevice device) {
-        if (device.getFirmwareVersion() != null) {
-            return PebbleUtils.getFwMajor(device.getFirmwareVersion()) >= 3;
-        }
-        return false;
+        return true;
    }

    @Override
@@ -84,9 +84,6 @@ class AppMessageHandlerMisfit extends AppMessageHandler {
                        break;
                    }

-                    if (mPebbleProtocol.mFwMajor < 3) {
-                        timestamp -= SimpleTimeZone.getDefault().getOffset(timestamp * 1000L) / 1000;
-                    }
                    Date startDate = new Date((long) timestamp * 1000L);
                    Date endDate = new Date((long) (timestamp + samples * 60) * 1000L);
                    LOG.info("got data from " + startDate + " to " + endDate);
@@ -151,9 +151,6 @@ class AppMessageHandlerMorpheuz extends AppMessageHandler {
                ctrl_message |= CTRL_VERSION_DONE;
            } else if (pair.first.equals(keyBase)) {
                recording_base_timestamp = (int) pair.second;
-                if (mPebbleProtocol.mFwMajor < 3) {
-                    recording_base_timestamp -= SimpleTimeZone.getDefault().getOffset(recording_base_timestamp * 1000L) / 1000;
-                }
                LOG.info("got base: " + recording_base_timestamp);
                ctrl_message |= CTRL_SET_LAST_SENT | CTRL_DO_NEXT;
            } else if (pair.first.equals(keyAutoReset)) {
@@ -236,8 +236,6 @@ class PebbleIoThread extends GBDeviceIoThread {
            return false;
        }

-        mPebbleProtocol.setForceProtocol(devicePrefs.getBoolean("pebble_force_protocol", false));
-
        mIsConnected = true;
        write(mPebbleProtocol.encodeFirmwareVersionReq());
        gbDevice.setUpdateState(GBDevice.State.CONNECTED, getContext());
@@ -337,12 +335,8 @@ class PebbleIoThread extends GBDeviceIoThread {
                        case APP_REFRESH:
                            if (mPBWReader.isFirmware()) {
                                writeInstallApp(mPebbleProtocol.encodeInstallFirmwareComplete());
-                                finishInstall(false);
-                            } else if (mPBWReader.isLanguage() || mPebbleProtocol.mFwMajor >= 3) {
-                                finishInstall(false); // FIXME: don't know yet how to detect success
-                            } else {
-                                writeInstallApp(mPebbleProtocol.encodeAppRefresh(mInstallSlot));
                            }
+                            finishInstall(false); // FIXME: don't know yet how to detect success
                            break;
                        default:
                            break;
@@ -469,8 +463,8 @@ class PebbleIoThread extends GBDeviceIoThread {
        if (bytes == null) {
            return;
        }
-        // on FW < 3.0 block writes if app installation in in progress
-        if (!mIsConnected || (mPebbleProtocol.mFwMajor < 3 && mIsInstalling && mInstallState != PebbleAppInstallState.WAIT_SLOT)) {
+
+        if (!mIsConnected) {
            return;
        }
        write_real(bytes);
@@ -649,7 +643,7 @@ class PebbleIoThread extends GBDeviceIoThread {
            writeInstallApp(mPebbleProtocol.encodeGetTime());
        } else {
            mCurrentlyInstallingApp = mPBWReader.getGBDeviceApp();
-            if (mPebbleProtocol.mFwMajor >= 3 && !mPBWReader.isLanguage()) {
+            if (!mPBWReader.isLanguage()) {
                if (appId == 0) {
                    // only install metadata - not the binaries
                    write(mPebbleProtocol.encodeInstallMetadata(mCurrentlyInstallingApp.getUUID(), mCurrentlyInstallingApp.getName(), mPBWReader.getAppVersion(), mPBWReader.getSdkVersion(), mPBWReader.getFlags(), mPBWReader.getIconId()));
@@ -697,7 +691,7 @@ class PebbleIoThread extends GBDeviceIoThread {
            GB.updateInstallNotification(getContext().getString(R.string.installation_failed_), false, 0, getContext());
        } else {
            GB.updateInstallNotification(getContext().getString(R.string.installation_successful), false, 0, getContext());
-            if (mPebbleProtocol.mFwMajor >= 3) {
+
            String filenameSuffix;
            if (mCurrentlyInstallingApp != null) {
                if (mCurrentlyInstallingApp.getType() == GBDeviceApp.Type.WATCHFACE) {
@@ -709,7 +703,7 @@ class PebbleIoThread extends GBDeviceIoThread {
                Intent refreshIntent = new Intent(AbstractAppManagerFragment.ACTION_REFRESH_APPLIST);
                LocalBroadcastManager.getInstance(getContext()).sendBroadcast(refreshIntent);
            }
-            }
+
        }
        mInstallState = PebbleAppInstallState.UNKNOWN;

@@ -65,7 +65,6 @@ import nodomain.freeyourgadget.gadgetbridge.model.CannedMessagesSpec;
 import nodomain.freeyourgadget.gadgetbridge.model.MusicStateSpec;
 import nodomain.freeyourgadget.gadgetbridge.model.NotificationSpec;
 import nodomain.freeyourgadget.gadgetbridge.model.NotificationSpec.Action;
-import nodomain.freeyourgadget.gadgetbridge.model.NotificationType;
 import nodomain.freeyourgadget.gadgetbridge.model.WeatherSpec;
 import nodomain.freeyourgadget.gadgetbridge.model.weather.Weather;
 import nodomain.freeyourgadget.gadgetbridge.model.weather.WeatherMapper;
@@ -235,8 +234,6 @@ public class PebbleProtocol extends GBDeviceProtocol {
    private static final byte PHONEVERSION_APPVERSION_MAJOR = 2;
    private static final byte PHONEVERSION_APPVERSION_MINOR = 3;
    private static final byte PHONEVERSION_APPVERSION_PATCH = 0;
-
-
    private static final int PHONEVERSION_SESSION_CAPS_GAMMARAY = 0x80000000;

    private static final int PHONEVERSION_REMOTE_CAPS_TELEPHONY = 0x00000010;
@@ -308,8 +305,6 @@ public class PebbleProtocol extends GBDeviceProtocol {
    int mFwMajor = 3;
    boolean mEnablePebbleKit = false;
    boolean mAlwaysACKPebbleKit = false;
-    private boolean mForceProtocol = false;
-
    private byte[] screenshotData = null;
    private int screenshotWidth;
    private int screenshotHeight;
@@ -446,10 +441,10 @@ public class PebbleProtocol extends GBDeviceProtocol {
        super(device);
        mAppMessageHandlers.put(UUID_MORPHEUZ, new AppMessageHandlerMorpheuz(UUID_MORPHEUZ, PebbleProtocol.this));
        mAppMessageHandlers.put(UUID_MISFIT, new AppMessageHandlerMisfit(UUID_MISFIT, PebbleProtocol.this));
-        mAppMessageHandlers.put(UUID_WEATHER, new AppMessageHandler(UUID_WEATHER, PebbleProtocol.this){
+        mAppMessageHandlers.put(UUID_WEATHER, new AppMessageHandler(UUID_WEATHER, PebbleProtocol.this) {
            @Override
            public GBDeviceEvent[] onAppStart() {
-                return new GBDeviceEvent[] {new GBDeviceEventSendBytes(encodeSendWeather())};
+                return new GBDeviceEvent[]{new GBDeviceEventSendBytes(encodeSendWeather())};
            }
        });
        if (!((PebbleCoordinator) device.getDeviceCoordinator()).isBackgroundJsEnabled(device)) {
@@ -545,22 +540,11 @@ public class PebbleProtocol extends GBDeviceProtocol {
        }

        long ts = System.currentTimeMillis();
-        if (mFwMajor < 3) {
-            ts += (SimpleTimeZone.getDefault().getOffset(ts));
-        }
        ts /= 1000;

-        if (mFwMajor >= 3 || mForceProtocol || notificationSpec.type != NotificationType.GENERIC_EMAIL) {
-            // 3.x notification
        return encodeNotification(id, (int) (ts & 0xffffffffL), title, subtitle, notificationSpec.body,
                pebbleNotification,
                notificationSpec.cannedReplies, notificationSpec.attachedActions);
-        } else {
-            // 1.x notification on FW 2.X
-            String[] parts = {title, notificationSpec.body, String.valueOf(ts), subtitle};
-            // be aware that type is at this point always NOTIFICATION_EMAIL
-            return encodeMessage(ENDPOINT_NOTIFICATION, NOTIFICATION_EMAIL, 0, parts);
-        }
    }

    @Override
@@ -593,7 +577,7 @@ public class PebbleProtocol extends GBDeviceProtocol {
            // For all-day events, Pebble expects the start date to match the midnight boundaries
            // in the user's timezone. However, the calendar event will have them in the UTC timezone,
            // so we need to convert it
-            long startTimestampMs = ((long)startTimestamp) * 1000;
+            long startTimestampMs = ((long) startTimestamp) * 1000;
            startTimestamp = (int) (DateTimeUtils.utcDateTimeToLocal(startTimestampMs) / 1000);
        }

@@ -611,7 +595,6 @@ public class PebbleProtocol extends GBDeviceProtocol {
        long ts = System.currentTimeMillis();
        long ts_offset = (SimpleTimeZone.getDefault().getOffset(ts));
        ByteBuffer buf;
-        if (mFwMajor >= 3) {
        String timezone = SimpleTimeZone.getDefault().getID();
        short length = (short) (LENGTH_SETTIME + timezone.getBytes().length + 3);
        buf = ByteBuffer.allocate(LENGTH_PREFIX + length);
@@ -624,14 +607,6 @@ public class PebbleProtocol extends GBDeviceProtocol {
        buf.put((byte) timezone.getBytes().length);
        buf.put(timezone.getBytes());
        LOG.info(timezone);
-        } else {
-            buf = ByteBuffer.allocate(LENGTH_PREFIX + LENGTH_SETTIME);
-            buf.order(ByteOrder.BIG_ENDIAN);
-            buf.putShort(LENGTH_SETTIME);
-            buf.putShort(ENDPOINT_TIME);
-            buf.put(TIME_SETTIME);
-            buf.putInt((int) ((ts + ts_offset) / 1000));
-        }
        return buf.array();
    }

@@ -884,12 +859,8 @@ public class PebbleProtocol extends GBDeviceProtocol {
            }
        }

-        byte attributes_count = 0;
-        short attributes_length = actions_length;
-        if (mFwMajor >= 3) {
-            attributes_count += 2; // icon
-            attributes_length += 11;
-        }
+        byte attributes_count = 2;
+        short attributes_length = (short) (actions_length + 11);

        for (String s : parts) {
            if (s == null || s.isEmpty()) {
@@ -903,21 +874,13 @@ public class PebbleProtocol extends GBDeviceProtocol {
        int max_partlength;
        byte dismiss_action_type;
        ByteBuffer buf;
-        if (mFwMajor >= 3) {
        length = (short) (NOTIFICATION_PIN_LENGTH + attributes_length);
        max_partlength = 512;
        dismiss_action_type = 0x02; // generic action, dismiss did not do anything
        buf = ByteBuffer.allocate(length);
-        } else {
-            length = (short) (21 + attributes_length);
-            max_partlength = 256;
-            dismiss_action_type = 0x04; // dismiss
-            buf = ByteBuffer.allocate(length + LENGTH_PREFIX);
-        }

        buf.order(ByteOrder.BIG_ENDIAN);

-        if (mFwMajor >= 3) {
        // pin - 46 bytes
        buf.putLong(GB_UUID_MASK);
        buf.putLong(id);
@@ -930,21 +893,6 @@ public class PebbleProtocol extends GBDeviceProtocol {
        buf.putShort((short) 0x0001); // flags 0x0001 = ?
        buf.put((byte) 0x04); // layout (0x04 = notification?)
        buf.putShort(attributes_length); // total length of all attributes and actions in bytes
-        } else {
-            buf.putShort(length);
-            buf.putShort(ENDPOINT_EXTENSIBLENOTIFS);
-
-            buf.order(ByteOrder.LITTLE_ENDIAN); // !
-
-            buf.put((byte) 0x00); // ?
-            buf.put((byte) 0x01); // add notifications
-            buf.putInt(0x00000000); // flags - ?
-            buf.putInt(id);
-            buf.putInt(0x00000000); // ANCS id
-            buf.putInt(timestamp);
-            buf.put((byte) 0x01); // layout - ?
-
-        }
        buf.put(attributes_count);
        buf.put((byte) actions_count);

@@ -963,7 +911,6 @@ public class PebbleProtocol extends GBDeviceProtocol {
            buf.put(s.getBytes(), 0, partlength);
        }

-        if (mFwMajor >= 3) {
        buf.put((byte) 4); // icon
        buf.putShort((short) 4); // length of int
        buf.putInt(0x80000000 | icon_id);
@@ -971,10 +918,9 @@ public class PebbleProtocol extends GBDeviceProtocol {
        buf.put((byte) 28); // background_color
        buf.putShort((short) 1); // length of int
        buf.put(backgroundColor);
-        }

        if (attachedActions != null && !attachedActions.isEmpty()) {
-            for (int ai = 0 ; ai<attachedActions.size(); ai++) {
+            for (int ai = 0; ai < attachedActions.size(); ai++) {
                Action act = attachedActions.get(ai);
                switch (act.type) {
                    case Action.TYPE_SYNTECTIC_OPEN:
@@ -1022,32 +968,8 @@ public class PebbleProtocol extends GBDeviceProtocol {
                }
            }
        }
-        if (mFwMajor >= 3) {
-            return encodeBlobdb(UUID.randomUUID(), BLOBDB_INSERT, BLOBDB_NOTIFICATION, buf.array());
-        } else {
-            return buf.array();
-        }
-    }

-    private byte[] encodeActionResponse2x(int id, byte actionId, int iconId, String caption) {
-        short length = (short) (18 + caption.getBytes().length);
-        ByteBuffer buf = ByteBuffer.allocate(LENGTH_PREFIX + length);
-        buf.order(ByteOrder.BIG_ENDIAN);
-        buf.putShort(length);
-        buf.putShort(ENDPOINT_EXTENSIBLENOTIFS);
-        buf.order(ByteOrder.LITTLE_ENDIAN);
-        buf.put(NOTIFICATIONACTION_RESPONSE);
-        buf.putInt(id);
-        buf.put(actionId);
-        buf.put(NOTIFICATIONACTION_ACK);
-        buf.put((byte) 2); //nr of attributes
-        buf.put((byte) 6); // icon
-        buf.putShort((short) 4); // length
-        buf.putInt(iconId);
-        buf.put((byte) 2); // title
-        buf.putShort((short) caption.getBytes().length);
-        buf.put(caption.getBytes());
-        return buf.array();
+        return encodeBlobdb(UUID.randomUUID(), BLOBDB_INSERT, BLOBDB_NOTIFICATION, buf.array());
    }

    private byte[] encodeWeatherPin(int timestamp, String title, String subtitle, String body, String location, int iconId) {
@@ -1338,10 +1260,6 @@ public class PebbleProtocol extends GBDeviceProtocol {

    @Override
    public byte[] encodeSetMusicState(byte state, int position, int playRate, byte shuffle, byte repeat) {
-        if (mFwMajor < 3) {
-            return null;
-        }
-
        byte playState = switch (state) {
            case MusicStateSpec.STATE_PLAYING -> MUSICCONTROL_STATE_PLAYING;
            case MusicStateSpec.STATE_PAUSED -> MUSICCONTROL_STATE_PAUSED;
@@ -1369,7 +1287,7 @@ public class PebbleProtocol extends GBDeviceProtocol {
    @Override
    public byte[] encodeSetMusicInfo(String artist, String album, String track, int duration, int trackCount, int trackNr) {
        String[] parts = {artist, album, track};
-        if (duration == 0 || mFwMajor < 3) {
+        if (duration == 0) {
            return encodeMessage(ENDPOINT_MUSICCONTROL, MUSICCONTROL_SETMUSICINFO, 0, parts);
        } else {
            // Calculate length first
@@ -1418,15 +1336,11 @@ public class PebbleProtocol extends GBDeviceProtocol {

    @Override
    public byte[] encodeAppInfoReq() {
-        if (mFwMajor >= 3) {
-            return null; // can't do this on 3.x :(
-        }
-        return encodeSimpleMessage(ENDPOINT_APPMANAGER, APPMANAGER_GETUUIDS);
+        return null; // not supported
    }

    @Override
    public byte[] encodeAppStart(UUID uuid, boolean start) {
-        if (mFwMajor >= 3) {
        final short LENGTH_APPRUNSTATE = 17;
        ByteBuffer buf = ByteBuffer.allocate(LENGTH_PREFIX + LENGTH_APPRUNSTATE);
        buf.order(ByteOrder.BIG_ENDIAN);
@@ -1436,17 +1350,10 @@ public class PebbleProtocol extends GBDeviceProtocol {
        buf.putLong(uuid.getMostSignificantBits());
        buf.putLong(uuid.getLeastSignificantBits());
        return buf.array();
-        } else {
-            ArrayList<Pair<Integer, Object>> pairs = new ArrayList<>();
-            int param = start ? 1 : 0;
-            pairs.add(new Pair<>(1, param));
-            return encodeApplicationMessagePush(ENDPOINT_LAUNCHER, uuid, pairs, null);
-        }
    }

    @Override
    public byte[] encodeAppDelete(UUID uuid) {
-        if (mFwMajor >= 3) {
        if (UUID_PEBBLE_HEALTH.equals(uuid)) {
            return encodeActivateHealth(false);
        }
@@ -1457,51 +1364,16 @@ public class PebbleProtocol extends GBDeviceProtocol {
            return encodeActivateWeather(false);
        }
        return encodeBlobdb(uuid, BLOBDB_DELETE, BLOBDB_APP, null);
-        } else {
-            final short LENGTH_REMOVEAPP_2X = 17;
-            ByteBuffer buf = ByteBuffer.allocate(LENGTH_PREFIX + LENGTH_REMOVEAPP_2X);
-            buf.order(ByteOrder.BIG_ENDIAN);
-            buf.putShort(LENGTH_REMOVEAPP_2X);
-            buf.putShort(ENDPOINT_APPMANAGER);
-            buf.put(APPMANAGER_REMOVEAPP);
-            buf.putLong(uuid.getMostSignificantBits());
-            buf.putLong(uuid.getLeastSignificantBits());
-            return buf.array();
-        }
    }

-    private byte[] encodePhoneVersion2x(byte os) {
-        final short LENGTH_PHONEVERSION = 17;
+    private byte[] encodePhoneVersion(byte os) {
+        final short LENGTH_PHONEVERSION = 25;
        ByteBuffer buf = ByteBuffer.allocate(LENGTH_PREFIX + LENGTH_PHONEVERSION);
        buf.order(ByteOrder.BIG_ENDIAN);
        buf.putShort(LENGTH_PHONEVERSION);
        buf.putShort(ENDPOINT_PHONEVERSION);
        buf.put((byte) 0x01);
        buf.putInt(-1); //0xffffffff
-
-        if (os == PHONEVERSION_REMOTE_OS_ANDROID) {
-            buf.putInt(PHONEVERSION_SESSION_CAPS_GAMMARAY);
-        } else {
-            buf.putInt(0);
-        }
-        buf.putInt(PHONEVERSION_REMOTE_CAPS_SMS | PHONEVERSION_REMOTE_CAPS_TELEPHONY | os);
-
-        buf.put(PHONEVERSION_APPVERSION_MAGIC);
-        buf.put(PHONEVERSION_APPVERSION_MAJOR);
-        buf.put(PHONEVERSION_APPVERSION_MINOR);
-        buf.put(PHONEVERSION_APPVERSION_PATCH);
-
-        return buf.array();
-    }
-
-    private byte[] encodePhoneVersion3x(byte os) {
-        final short LENGTH_PHONEVERSION3X = 25;
-        ByteBuffer buf = ByteBuffer.allocate(LENGTH_PREFIX + LENGTH_PHONEVERSION3X);
-        buf.order(ByteOrder.BIG_ENDIAN);
-        buf.putShort(LENGTH_PHONEVERSION3X);
-        buf.putShort(ENDPOINT_PHONEVERSION);
-        buf.put((byte) 0x01);
-        buf.putInt(-1); //0xffffffff
        buf.putInt(0);

        buf.putInt(os);
@@ -1527,10 +1399,6 @@ public class PebbleProtocol extends GBDeviceProtocol {
        return buf.array();
    }

-    private byte[] encodePhoneVersion(byte os) {
-        return encodePhoneVersion3x(os);
-    }
-
    @Override
    public byte[] encodeReset(int flags) {
        return encodeSimpleMessage(ENDPOINT_RESET, RESET_REBOOT);
@@ -1608,7 +1476,7 @@ public class PebbleProtocol extends GBDeviceProtocol {
    /* pebble specific install methods */
    byte[] encodeUploadStart(byte type, int app_id, int size, String filename) {
        short length;
-        if (mFwMajor >= 3 && (type != PUTBYTES_TYPE_FILE)) {
+        if (type != PUTBYTES_TYPE_FILE) {
            length = (short) 10;
            type |= (byte) 0b10000000;
        } else {
@@ -1627,7 +1495,7 @@ public class PebbleProtocol extends GBDeviceProtocol {
        buf.putInt(size);
        buf.put(type);

-        if (mFwMajor >= 3 && (type != PUTBYTES_TYPE_FILE)) {
+        if (type != PUTBYTES_TYPE_FILE) {
            buf.putInt(app_id);
        } else {
            // slot
@@ -2067,7 +1935,7 @@ public class PebbleProtocol extends GBDeviceProtocol {
            headerbuf.putInt(screenshotWidth);
            headerbuf.putInt(-screenshotHeight);
            headerbuf.putShort((short) 1); // planes
-            headerbuf.putShort((short) screenshotBpp);
+            headerbuf.putShort(screenshotBpp);
            headerbuf.putInt(0); // compression
            headerbuf.putInt(0); // length of pixeldata in bytes (uncompressed=0)
            headerbuf.putInt(0); // pixels per meter (x)
@@ -2094,20 +1962,14 @@ public class PebbleProtocol extends GBDeviceProtocol {
        byte command = buf.get();
        if (command == NOTIFICATIONACTION_INVOKE) {
            int id;
-            UUID uuid = new UUID(0,0);
-            if (mFwMajor >= 3) {
-                uuid = getUUID(buf);
+            UUID uuid = getUUID(buf);
            id = (int) (uuid.getLeastSignificantBits() & 0xffffffffL);
-            } else {
-                id = buf.getInt();
-            }
            byte action = buf.get();
            if (action >= 0x00 && action <= 0xf) {
                GBDeviceEventNotificationControl devEvtNotificationControl = new GBDeviceEventNotificationControl();
                devEvtNotificationControl.handle = id;
                String caption = "undefined";
                int icon_id = 1;
-                boolean needsAck2x = true;
                switch (action) {
                    case 0x01:
                        devEvtNotificationControl.event = GBDeviceEventNotificationControl.Event.OPEN;
@@ -2118,13 +1980,11 @@ public class PebbleProtocol extends GBDeviceProtocol {
                        devEvtNotificationControl.event = GBDeviceEventNotificationControl.Event.DISMISS;
                        caption = "Dismissed";
                        icon_id = PebbleIconID.RESULT_DISMISSED;
-                        needsAck2x = false;
                        break;
                    case 0x03:
                        devEvtNotificationControl.event = GBDeviceEventNotificationControl.Event.DISMISS_ALL;
                        caption = "All dismissed";
                        icon_id = PebbleIconID.RESULT_DISMISSED;
-                        needsAck2x = false;
                        break;
                    case 0x04:
                        devEvtNotificationControl.event = GBDeviceEventNotificationControl.Event.MUTE;
@@ -2170,14 +2030,8 @@ public class PebbleProtocol extends GBDeviceProtocol {
                        break;
                }
                GBDeviceEventSendBytes sendBytesAck = null;
-                if (mFwMajor >= 3 || needsAck2x) {
                sendBytesAck = new GBDeviceEventSendBytes();
-                    if (mFwMajor >= 3) {
                sendBytesAck.encodedBytes = encodeActionResponse(uuid, icon_id, caption);
-                    } else {
-                        sendBytesAck.encodedBytes = encodeActionResponse2x(id, action, 6, caption);
-                    }
-                }
                return new GBDeviceEvent[]{sendBytesAck, devEvtNotificationControl};
            }
            LOG.info("unexpected action: {}", action);
@@ -2239,8 +2093,7 @@ public class PebbleProtocol extends GBDeviceProtocol {
                if (handler != null) {
                    currentRunningApp = uuid;
                    return handler.onAppStart();
-                }
-                else {
+                } else {
                    if (!uuid.equals(currentRunningApp)) {
                        currentRunningApp = uuid;
                        GBDeviceEventAppManagement gbDeviceEventAppManagement = new GBDeviceEventAppManagement();
@@ -2395,8 +2248,7 @@ public class PebbleProtocol extends GBDeviceProtocol {
        byte status = buf.get();
        if (status == 1) {
            LOG.info("app reordering successful");
-        }
-        else {
+        } else {
            LOG.info("app reordering returned status {}", status);
        }
        return null;
@@ -2612,8 +2464,7 @@ public class PebbleProtocol extends GBDeviceProtocol {
                                if (endpoint == ENDPOINT_APPLICATIONMESSAGE) {
                                    ArrayList<Pair<Integer, Object>> dict = decodeDict(buf);
                                    devEvts = handler.handleMessage(dict);
-                                }
-                                else {
+                                } else {
                                    devEvts = handler.onAppStart();
                                }
                            } else {
@@ -2724,11 +2575,6 @@ public class PebbleProtocol extends GBDeviceProtocol {
        return devEvts;
    }

-    void setForceProtocol(boolean force) {
-        LOG.info("setting force protocol to {}", force);
-        mForceProtocol = force;
-    }
-
    void setAlwaysACKPebbleKit(boolean alwaysACKPebbleKit) {
        LOG.info("setting always ACK PebbleKit to {}", alwaysACKPebbleKit);
        mAlwaysACKPebbleKit = alwaysACKPebbleKit;
@@ -20,13 +20,6 @@
            android:summary="@string/pref_summary_pebble_forceuntested"
            android:title="@string/pref_title_pebble_forceuntested"
            app:iconSpaceReserved="false" />
-        <SwitchPreferenceCompat
-            android:defaultValue="false"
-            android:key="pebble_force_protocol"
-            android:layout="@layout/preference_checkbox"
-            android:summary="@string/pref_summary_pebble_forceprotocol"
-            android:title="@string/pref_title_pebble_forceprotocol"
-            app:iconSpaceReserved="false" />
        <SwitchPreferenceCompat
            android:defaultValue="false"
            android:key="pebble_gatt_clientonly"