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

Commit 6d2eee71 authored by Marvin W.'s avatar Marvin W. 🐿️
Browse files

Small updates to wearable

parent 192a9073

GmsApi @ 18582ce0

Compare 865b4166 to 18582ce0
Original line number Diff line number Diff line 
Subproject commit 865b41664d6afabecddbd1a5d1b7c702d0bd821f
 
Subproject commit 18582ce01a3ba70f1332524bba38a0b54ba6b13f

Wearable @ c12fe119

Compare e6d59dc0 to c12fe119
Original line number Diff line number Diff line 
Subproject commit e6d59dc062def314cdebf64699b15bb8b6a5eede
 
Subproject commit c12fe119c8f71b4e7b458f480270f686dae34343

play-services-core/src/main/java/org/microg/gms/ui/SettingsActivity.java

+1 −0
Original line number Diff line number Diff line
@@ -113,6 +113,7 @@ public class SettingsActivity extends AppCompatActivity { 
            libraries.add(new Library("org.microg.safeparcel", "microG SafeParcel", "Apache License 2.0, Copyright © microG Team"));

            libraries.add(new Library("org.microg.nlp", "microG UnifiedNlp", "Apache License 2.0, Copyright © microG Team"));

            libraries.add(new Library("org.microg.nlp.api", "microG UnifiedNlp Api", "Apache License 2.0, Copyright © microG Team"));

            libraries.add(new Library("org.microg.wearable", "microG Wearable", "Apache License 2.0, Copyright © microG Team"));

            libraries.add(new Library("de.hdodenhof.circleimageview", "CircleImageView", "Apache License 2.0, Copyright © Henning Dodenhof"));

            libraries.add(new Library("org.oscim.android", "<vector<tile>>map", "GNU LGPLv3, Copyright © Hannes Janetzek"));

            libraries.add(new Library("com.squareup.wire", "Wire Protocol Buffers", "Apache License 2.0, Copyright © Square Inc."));

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

+10 −3
Original line number Diff line number Diff line
@@ -26,10 +26,13 @@ import com.google.android.gms.wearable.ConnectionConfiguration; 


import java.util.ArrayList;

import java.util.List;

import java.util.Random;



public class ConfigurationDatabaseHelper extends SQLiteOpenHelper {



    public static final String NULL_STRING = "NULL_STRING";

    public static final String TABLE_NAME = "connectionConfigurations";

    public static final String BY_NAME = "name=?";



    public ConfigurationDatabaseHelper(Context context) {

        super(context, "connectionconfig.db", null, 2);
@@ -58,7 +61,7 @@ public class ConfigurationDatabaseHelper extends SQLiteOpenHelper { 
    }



    public ConnectionConfiguration getConfiguration(String name) {

        Cursor cursor = getReadableDatabase().query("connectionConfigurations", null, "name=?", new String[]{name}, null, null, null);

        Cursor cursor = getReadableDatabase().query(TABLE_NAME, null, BY_NAME, new String[]{name}, null, null, null);

        ConnectionConfiguration config = null;

        if (cursor != null) {

            if (cursor.moveToNext())
@@ -86,11 +89,11 @@ public class ConfigurationDatabaseHelper extends SQLiteOpenHelper { 
        contentValues.put("role", config.role);

        contentValues.put("connectionEnabled", true);

        contentValues.put("nodeId", config.nodeId);

        getWritableDatabase().insert("connectionConfigurations", null, contentValues);

        getWritableDatabase().insert(TABLE_NAME, null, contentValues);

    }



    public ConnectionConfiguration[] getAllConfigurations() {

        Cursor cursor = getReadableDatabase().query("connectionConfigurations", null, null, null, null, null, null);

        Cursor cursor = getReadableDatabase().query(TABLE_NAME, null, null, null, null, null, null);

        if (cursor != null) {

            List<ConnectionConfiguration> configurations = new ArrayList<ConnectionConfiguration>();

            while (cursor.moveToNext()) {
@@ -106,4 +109,8 @@ public class ConfigurationDatabaseHelper extends SQLiteOpenHelper { 
    public void setEnabledState(String name, boolean enabled) {

        getWritableDatabase().execSQL("UPDATE connectionConfigurations SET connectionEnabled=? WHERE name=?", new String[]{enabled ? "1" : "0", name});

    }



    public int deleteConfiguration(String name) {

        return getWritableDatabase().delete(TABLE_NAME, BY_NAME, new String[]{name});

    }

}

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

+7 −2
Original line number Diff line number Diff line
@@ -104,11 +104,16 @@ public class MessageHandler extends ServerMessageListener { 
        if (syncStart.version < 2) {

            Log.d(TAG, "Sync uses version " + syncStart.version + " which is not supported (yet)");

        }

        boolean hasLocalNode = false;

        if (syncStart.syncTable != null) {

            for (SyncTableEntry entry : syncStart.syncTable) {

                service.syncToPeer(getConnection(), entry.key, entry.value);

                if (service.getLocalNodeId().equals(entry.key)) hasLocalNode = true;

            }

        } else {

            Log.d(TAG, "No sync table given.");

        }

        if (!hasLocalNode) service.syncToPeer(getConnection(), service.getLocalNodeId(), 0);

    }



    @Override
@@ -137,8 +142,8 @@ public class MessageHandler extends ServerMessageListener { 
    }



    @Override

    public void onHearbeat(Heartbeat heartbeat) {

        Log.d(TAG, "onHearbeat: " + heartbeat);

    public void onHeartbeat(Heartbeat heartbeat) {

        Log.d(TAG, "onHeartbeat: " + heartbeat);

    }



    @Override