Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a239f5e authored by Marvin W.'s avatar Marvin W. 🐿️
Browse files

Small fixes to Wearable

parent 2cd12cce

GmsApi @ 96540b11

Compare c959e728 to 96540b11
Original line number Diff line number Diff line 
Subproject commit c959e72839430ee32d6c9bebee1d2531b4e8e31c
 
Subproject commit 96540b11c64f6e5821e86014a9b32647307a89d6

play-services-core/src/main/java/org/microg/gms/wearable/NodeDatabaseHelper.java

+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ public class NodeDatabaseHelper extends SQLiteOpenHelper { 
    }



    private static void updateRecord(SQLiteDatabase db, String key, DataItemRecord record) {

        Log.d(TAG, "updateRecord: " + record);

        Log.d(TAG, "updateRecord not implemented: " + record);

    }



    private String insertRecord(SQLiteDatabase db, DataItemRecord record) {

play-services-core/src/main/java/org/microg/gms/wearable/WearableServiceImpl.java

+10 −3
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ public class WearableServiceImpl extends IWearableService.Stub implements IWeara 


    @Override

    public void putData(IWearableCallbacks callbacks, PutDataRequest request) throws RemoteException {

        Log.d(TAG, "putData: " + request);

        Log.d(TAG, "putData: " + request.toString(true));

        String host = request.getUri().getHost();

        if (TextUtils.isEmpty(host)) host = getLocalNodeId();

        DataItemInternal dataItem = new DataItemInternal(host, request.getUri().getPath());
@@ -169,15 +169,21 @@ public class WearableServiceImpl extends IWearableService.Stub implements IWeara 
                    stream.close();

                    success = tmpFile.renameTo(assetFile);

                } catch (IOException e) {

                    Log.w(TAG, e);

                }

            }

            if (success) {

                Log.d(TAG, "Successfully created asset file " + assetFile);

                return Asset.createFromRef(digest);

            } else {

                Log.w(TAG, "Failed creating asset file " + assetFile);

            }

        }

        return null;

    }



    private File createAssetFile(String digest) {

        File dir = new File(new File(context.getFilesDir(), "assets"), digest.substring(digest.length() - 2, digest.length()));

        File dir = new File(new File(context.getFilesDir(), "assets"), digest.substring(digest.length() - 2));

        dir.mkdirs();

        return new File(dir, digest + ".asset");

    }
@@ -198,6 +204,7 @@ public class WearableServiceImpl extends IWearableService.Stub implements IWeara 
            if (cursor.moveToNext()) {

                DataItemParcelable dataItem = new DataItemParcelable(new Uri.Builder().scheme("wear").authority(cursor.getString(0)).path(cursor.getString(1)).build());

                dataItem.data = cursor.getBlob(2);

                Log.d(TAG, "getDataItem.asset " + cursor.getString(5));

                // TODO: assets

                callbacks.onGetDataItemResponse(new GetDataItemResponse(0, dataItem));

            }