demus/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge.git synced 2025-01-10 17:11:56 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

make sure Intent broadcasts do not leave Gadgetbridge, add missing xml file

Browse Source
This commit is contained in:
Andreas Shimokawa 2015-03-27 12:13:19 +01:00
parent b20aaf59a8
commit 0dacc1f9c7
4 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -1,5 +1,10 @@
###Changelog ###Changelog
####Version 0.1.4
* New AppManager shows installed Apps/Watchfaces (removal possible via context menu)
* Allow back navigation in ActionBar (Debug and AppMananger Activities)
* Make sure Intent broadcasts do not leave Gadgetbridge
####Version 0.1.3 ####Version 0.1.3
* Remove the connect button, list all suported devices and connect on tap instead * Remove the connect button, list all suported devices and connect on tap instead
* Display connection status and firmware of connected devices in the device list * Display connection status and firmware of connected devices in the device list

12
app/src/main/AndroidManifest.xml
View File

@ -76,17 +76,23 @@
<action android:name="com.andrew.apollo.metachanged" /> <action android:name="com.andrew.apollo.metachanged" />
</intent-filter> </intent-filter>
</receiver> </receiver>
<receiver android:name=".BluetoothStateChangeReceiver"> <receiver
android:name=".BluetoothStateChangeReceiver"
android:exported="false">
<intent-filter> <intent-filter>
<action android:name="android.bluetooth.adapter.action.STATE_CHANGED" /> <action android:name="android.bluetooth.adapter.action.STATE_CHANGED" />
</intent-filter> </intent-filter>
</receiver> </receiver>
<receiver android:name=".GBMusicControlReceiver"> <receiver
android:name=".GBMusicControlReceiver"
android:exported="false">
<intent-filter> <intent-filter>
<action android:name="nodomain.freeyourgadget.gadgetbridge.musiccontrol" /> <action android:name="nodomain.freeyourgadget.gadgetbridge.musiccontrol" />
</intent-filter> </intent-filter>
</receiver> </receiver>
<receiver android:name=".GBCallControlReceiver"> <receiver
android:name=".GBCallControlReceiver"
android:exported="false">
<intent-filter> <intent-filter>
<action android:name="nodomain.freeyourgadget.gadgetbridge.callcontrol" /> <action android:name="nodomain.freeyourgadget.gadgetbridge.callcontrol" />
</intent-filter> </intent-filter>

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

@ -135,6 +135,7 @@ public class BluetoothCommunicationService extends Service {
GBDeviceCommandMusicControl musicCmd = (GBDeviceCommandMusicControl) deviceCmd; GBDeviceCommandMusicControl musicCmd = (GBDeviceCommandMusicControl) deviceCmd;
Intent musicIntent = new Intent(GBMusicControlReceiver.ACTION_MUSICCONTROL); Intent musicIntent = new Intent(GBMusicControlReceiver.ACTION_MUSICCONTROL);
musicIntent.putExtra("command", musicCmd.command.ordinal()); musicIntent.putExtra("command", musicCmd.command.ordinal());
musicIntent.setPackage(this.getPackageName());
sendBroadcast(musicIntent); sendBroadcast(musicIntent);
break; break;
case CALL_CONTROL: case CALL_CONTROL:
@ -142,6 +143,7 @@ public class BluetoothCommunicationService extends Service {
GBDeviceCommandCallControl callCmd = (GBDeviceCommandCallControl) deviceCmd; GBDeviceCommandCallControl callCmd = (GBDeviceCommandCallControl) deviceCmd;
Intent callIntent = new Intent(GBCallControlReceiver.ACTION_CALLCONTROL); Intent callIntent = new Intent(GBCallControlReceiver.ACTION_CALLCONTROL);
callIntent.putExtra("command", callCmd.command.ordinal()); callIntent.putExtra("command", callCmd.command.ordinal());
callIntent.setPackage(this.getPackageName());
sendBroadcast(callIntent); sendBroadcast(callIntent);
break; break;
case VERSION_INFO: case VERSION_INFO:
@ -165,7 +167,6 @@ public class BluetoothCommunicationService extends Service {
appInfoIntent.putExtra("app_id" + i.toString(), appInfoCmd.apps[i].getId()); appInfoIntent.putExtra("app_id" + i.toString(), appInfoCmd.apps[i].getId());
appInfoIntent.putExtra("app_index" + i.toString(), appInfoCmd.apps[i].getIndex()); appInfoIntent.putExtra("app_index" + i.toString(), appInfoCmd.apps[i].getIndex());
} }
LocalBroadcastManager.getInstance(this).sendBroadcast(appInfoIntent); LocalBroadcastManager.getInstance(this).sendBroadcast(appInfoIntent);
break; break;
case APP_MANAGEMENT_RES: case APP_MANAGEMENT_RES:

6
app/src/main/res/menu/appmanager_context.xml Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
<item
android:id="@+id/appmanager_app_delete"
android:title="@string/appmananger_app_delete"/>
</menu>