MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2024-11-29 21:32:57 +01:00
Code Releases Wiki Activity

Fossil Hybrid: file handle can be passed to service as string

Browse Source
This commit is contained in:
Daniel Dakhno 2021-01-28 11:34:43 +01:00
parent 3a4c5f6483
commit 614d711226
2 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/QHybridSupport.java
View File

@ -284,7 +284,11 @@ public class QHybridSupport extends QHybridBaseSupport {
} }
case QHYBRID_COMMAND_UPLOAD_FILE:{ case QHYBRID_COMMAND_UPLOAD_FILE:{
Object handleObject = intent.getSerializableExtra("EXTRA_HANDLE"); Object handleObject = intent.getSerializableExtra("EXTRA_HANDLE");
if(handleObject == null || !(handleObject instanceof FileHandle)) return; if(handleObject == null)return;
if(handleObject instanceof String){
handleObject = FileHandle.fromName((String)handleObject);
}
if(!(handleObject instanceof FileHandle)) return;
FileHandle handle = (FileHandle) handleObject; FileHandle handle = (FileHandle) handleObject;
String filePath = intent.getStringExtra("EXTRA_PATH"); String filePath = intent.getStringExtra("EXTRA_PATH");
watchAdapter.uploadFile(handle, filePath, intent.getBooleanExtra("EXTRA_ENCRYPTED", false)); watchAdapter.uploadFile(handle, filePath, intent.getBooleanExtra("EXTRA_ENCRYPTED", false));
@ -293,7 +297,7 @@ public class QHybridSupport extends QHybridBaseSupport {
} }
} }
}; };
LocalBroadcastManager.getInstance(getContext()).registerReceiver(commandReceiver, commandFilter); LocalBroadcastManager.getInstance(GBApplication.getContext()).registerReceiver(commandReceiver, commandFilter);
helper = new PackageConfigHelper(GBApplication.getContext()); helper = new PackageConfigHelper(GBApplication.getContext());
@ -301,6 +305,7 @@ public class QHybridSupport extends QHybridBaseSupport {
globalFilter.addAction(QHYBRID_ACTION_SET_ACTIVITY_HAND); globalFilter.addAction(QHYBRID_ACTION_SET_ACTIVITY_HAND);
globalFilter.addAction(QHYBRID_COMMAND_SET_MENU_MESSAGE); globalFilter.addAction(QHYBRID_COMMAND_SET_MENU_MESSAGE);
globalFilter.addAction(QHYBRID_COMMAND_SET_WIDGET_CONTENT); globalFilter.addAction(QHYBRID_COMMAND_SET_WIDGET_CONTENT);
globalFilter.addAction(QHYBRID_COMMAND_UPLOAD_FILE);
globalCommandReceiver = new BroadcastReceiver() { globalCommandReceiver = new BroadcastReceiver() {
@Override @Override
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
@ -363,6 +368,18 @@ public class QHybridSupport extends QHybridBaseSupport {
} }
break; break;
} }
case QHYBRID_COMMAND_UPLOAD_FILE:{
Object handleObject = intent.getSerializableExtra("EXTRA_HANDLE");
if(handleObject == null)return;
if(handleObject instanceof String){
handleObject = FileHandle.fromName((String)handleObject);
}
if(!(handleObject instanceof FileHandle)) return;
FileHandle handle = (FileHandle) handleObject;
String filePath = intent.getStringExtra("EXTRA_PATH");
watchAdapter.uploadFile(handle, filePath, intent.getBooleanExtra("EXTRA_ENCRYPTED", false));
break;
}
} }
} }
}; };

9
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/file/FileHandle.java
View File

@ -48,6 +48,15 @@ public enum FileHandle {
this.subHandle = subHandle; this.subHandle = subHandle;
} }
public static FileHandle fromName(String name){
for(FileHandle handle : FileHandle.values()){
if(handle.toString().equals(name)){
return handle;
}
}
return null;
}
public short getHandle(){ public short getHandle(){
return (short)((handle << 8) | (subHandle)); return (short)((handle << 8) | (subHandle));
} }