mirrors
/
Gadgetbridge
mirror of https://github.com/nico202/Gadgetbridge.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Big refactoring: move classes and packages around to get a better structure 

- model package contains mostly shared interfaces (UI+service), not named GB*
- impl package contains implementations of those interfaces, named GB*
  the impl classes should not be used by the service (not completely done)
- the service classes should mostly use classes inside the service and deviceevents
  packages (tbd)

Every device now has two packages:
- devices/[device name] for UI related functionality
- service[device name] for lowlevel communication
live-activity-data
cpfeiffer 2015-08-03 23:09:49 +02:00
parent afc4c9efaa
commit 7c597b325a
117 changed files with 487 additions and 376 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,7 +30,7 @@
android:label="@string/app_name"
android:theme="@style/GadgetbridgeTheme">
<activity
android:name=".ControlCenter"
android:name=".activities.ControlCenter"
android:label="@string/title_activity_controlcenter">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@ -39,32 +39,32 @@
</intent-filter>
</activity>
<activity
android:name=".SettingsActivity"
android:name=".activities.SettingsActivity"
android:label="@string/title_activity_settings">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".ControlCenter" />
android:value=".activities.ControlCenter" />
</activity>
<activity
android:name=".miband.MiBandPreferencesActivity"
android:name=".devices.miband.MiBandPreferencesActivity"
android:label="@string/preferences_miband_settings">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".SettingsActivity" />
android:value=".activities.SettingsActivity" />
</activity>
<activity
android:name=".AppManagerActivity"
android:name=".activities.AppManagerActivity"
android:label="@string/title_activity_appmanager">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".ControlCenter" />
android:value=".activities.ControlCenter" />
</activity>
<activity
android:name=".activities.FwAppInstallerActivity"
android:label="@string/title_activity_fw_app_insaller">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="nodomain.freeyourgadget.gadgetbridge.ControlCenter" />
android:value=".activities.ControlCenter" />
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
@ -164,7 +164,7 @@
<action android:name="android.service.notification.NotificationListenerService" />
</intent-filter>
</service>
<service android:name=".BluetoothCommunicationService" />
<service android:name=".service.BluetoothCommunicationService" />
<receiver
android:name=".externalevents.PhoneCallReceiver"
@ -223,14 +223,14 @@
</intent-filter>
</receiver>
<receiver
android:name=".GBMusicControlReceiver"
android:name=".service.receivers.GBMusicControlReceiver"
android:exported="false">
<intent-filter>
<action android:name="nodomain.freeyourgadget.gadgetbridge.musiccontrol" />
</intent-filter>
</receiver>
<receiver
android:name=".GBCallControlReceiver"
android:name=".service.receivers.GBCallControlReceiver"
android:exported="false">
<intent-filter>
<action android:name="nodomain.freeyourgadget.gadgetbridge.callcontrol" />
@ -238,40 +238,40 @@
</receiver>
<activity
android:name=".DebugActivity"
android:name=".activities.DebugActivity"
android:label="@string/title_activity_debug">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".ControlCenter" />
android:value=".activities.ControlCenter" />
</activity>
<activity
android:name=".discovery.DiscoveryActivity"
android:name=".activities.DiscoveryActivity"
android:label="@string/title_activity_discovery">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".ControlCenter" />
android:value=".activities.ControlCenter" />
</activity>
<activity
android:name=".activities.AndroidPairingActivity"
android:label="@string/title_activity_android_pairing"></activity>
<activity
android:name=".miband.MiBandPairingActivity"
android:name=".devices.miband.MiBandPairingActivity"
android:label="@string/title_activity_mi_band_pairing"></activity>
<activity
android:name=".activities.ChartsActivity"
android:name=".activities.charts.ChartsActivity"
android:label="@string/title_activity_charts"
android:parentActivityName=".ControlCenter">
android:parentActivityName=".activities.ControlCenter">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="nodomain.freeyourgadget.gadgetbridge.ControlCenter" />
android:value=".activities.ControlCenter" />
</activity>
<activity
android:name=".activities.ConfigureAlarms"
android:label="@string/title_activity_set_alarm"
android:parentActivityName=".SettingsActivity" >
android:parentActivityName=".activities.SettingsActivity" >
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="nodomain.freeyourgadget.gadgetbridge.SettingsActivity" />
android:value=".activities.SettingsActivity" />
</activity>
<activity
android:name=".activities.AlarmDetails"

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AlarmDetails.java
View File

@ -8,7 +8,7 @@ import android.view.MenuItem;
import android.widget.CheckBox;
import android.widget.TimePicker;
import nodomain.freeyourgadget.gadgetbridge.GBAlarm;
import nodomain.freeyourgadget.gadgetbridge.impl.GBAlarm;
import nodomain.freeyourgadget.gadgetbridge.GBApplication;
import nodomain.freeyourgadget.gadgetbridge.R;

5
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/AppManagerActivity.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AppManagerActivity.java
View File

@ -1,4 +1,4 @@
package nodomain.freeyourgadget.gadgetbridge;
package nodomain.freeyourgadget.gadgetbridge.activities;
import android.app.Activity;
import android.content.BroadcastReceiver;
@ -21,7 +21,10 @@ import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceApp;
import nodomain.freeyourgadget.gadgetbridge.R;
import nodomain.freeyourgadget.gadgetbridge.adapter.GBDeviceAppAdapter;
import nodomain.freeyourgadget.gadgetbridge.service.BluetoothCommunicationService;
public class AppManagerActivity extends Activity {

6
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ConfigureAlarms.java
View File

@ -11,12 +11,12 @@ import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
import nodomain.freeyourgadget.gadgetbridge.BluetoothCommunicationService;
import nodomain.freeyourgadget.gadgetbridge.GBAlarm;
import nodomain.freeyourgadget.gadgetbridge.service.BluetoothCommunicationService;
import nodomain.freeyourgadget.gadgetbridge.impl.GBAlarm;
import nodomain.freeyourgadget.gadgetbridge.R;
import nodomain.freeyourgadget.gadgetbridge.adapter.GBAlarmListAdapter;
import static nodomain.freeyourgadget.gadgetbridge.miband.MiBandConst.PREF_MIBAND_ALARMS;
import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.PREF_MIBAND_ALARMS;
public class ConfigureAlarms extends ListActivity {

15
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/ControlCenter.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ControlCenter.java
View File

@ -1,4 +1,4 @@
package nodomain.freeyourgadget.gadgetbridge;
package nodomain.freeyourgadget.gadgetbridge.activities;
import android.app.Activity;
import android.app.ProgressDialog;
@ -29,11 +29,16 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import nodomain.freeyourgadget.gadgetbridge.activities.ChartsActivity;
import nodomain.freeyourgadget.gadgetbridge.activities.ConfigureAlarms;
import nodomain.freeyourgadget.gadgetbridge.devices.DeviceCoordinator;
import nodomain.freeyourgadget.gadgetbridge.util.DeviceHelper;
import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
import nodomain.freeyourgadget.gadgetbridge.util.GB;
import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
import nodomain.freeyourgadget.gadgetbridge.R;
import nodomain.freeyourgadget.gadgetbridge.activities.charts.ChartsActivity;
import nodomain.freeyourgadget.gadgetbridge.adapter.GBDeviceAdapter;
import nodomain.freeyourgadget.gadgetbridge.discovery.DiscoveryActivity;
import nodomain.freeyourgadget.gadgetbridge.miband.MiBandConst;
import nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst;
import nodomain.freeyourgadget.gadgetbridge.service.BluetoothCommunicationService;
public class ControlCenter extends Activity {

15
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/DebugActivity.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DebugActivity.java
View File

@ -1,4 +1,4 @@
package nodomain.freeyourgadget.gadgetbridge;
package nodomain.freeyourgadget.gadgetbridge.activities;
import android.app.Activity;
import android.app.NotificationManager;
@ -21,8 +21,13 @@ import org.slf4j.LoggerFactory;
import java.io.File;
import nodomain.freeyourgadget.gadgetbridge.util.GB;
import nodomain.freeyourgadget.gadgetbridge.GBApplication;
import nodomain.freeyourgadget.gadgetbridge.model.ServiceCommand;
import nodomain.freeyourgadget.gadgetbridge.R;
import nodomain.freeyourgadget.gadgetbridge.database.DBHandler;
import nodomain.freeyourgadget.gadgetbridge.database.DBHelper;
import nodomain.freeyourgadget.gadgetbridge.service.BluetoothCommunicationService;
import nodomain.freeyourgadget.gadgetbridge.util.FileUtils;
@ -92,7 +97,7 @@ public class DebugActivity extends Activity {
Intent startIntent = new Intent(DebugActivity.this, BluetoothCommunicationService.class);
startIntent.setAction(BluetoothCommunicationService.ACTION_CALLSTATE);
startIntent.putExtra("call_phonenumber", editContent.getText().toString());
startIntent.putExtra("call_command", GBCommand.CALL_INCOMING.ordinal());
startIntent.putExtra("call_command", ServiceCommand.CALL_INCOMING.ordinal());
startService(startIntent);
}
});
@ -103,7 +108,7 @@ public class DebugActivity extends Activity {
Intent startIntent = new Intent(DebugActivity.this, BluetoothCommunicationService.class);
startIntent.setAction(BluetoothCommunicationService.ACTION_CALLSTATE);
startIntent.putExtra("call_phonenumber", editContent.getText().toString());
startIntent.putExtra("call_command", GBCommand.CALL_OUTGOING.ordinal());
startIntent.putExtra("call_command", ServiceCommand.CALL_OUTGOING.ordinal());
startService(startIntent);
}
});
@ -114,7 +119,7 @@ public class DebugActivity extends Activity {
public void onClick(View v) {
Intent startIntent = new Intent(DebugActivity.this, BluetoothCommunicationService.class);
startIntent.setAction(BluetoothCommunicationService.ACTION_CALLSTATE);
startIntent.putExtra("call_command", GBCommand.CALL_START.ordinal());
startIntent.putExtra("call_command", ServiceCommand.CALL_START.ordinal());
startService(startIntent);
}
});
@ -124,7 +129,7 @@ public class DebugActivity extends Activity {
public void onClick(View v) {
Intent startIntent = new Intent(DebugActivity.this, BluetoothCommunicationService.class);
startIntent.setAction(BluetoothCommunicationService.ACTION_CALLSTATE);
startIntent.putExtra("call_command", GBCommand.CALL_END.ordinal());
startIntent.putExtra("call_command", ServiceCommand.CALL_END.ordinal());
startService(startIntent);
}
});

19
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/discovery/DiscoveryActivity.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DiscoveryActivity.java
View File

@ -1,4 +1,4 @@
package nodomain.freeyourgadget.gadgetbridge.discovery;
package nodomain.freeyourgadget.gadgetbridge.activities;
import android.app.Activity;
import android.bluetooth.BluetoothAdapter;
@ -24,10 +24,11 @@ import org.slf4j.LoggerFactory;
import java.util.ArrayList;
import nodomain.freeyourgadget.gadgetbridge.DeviceCoordinator;
import nodomain.freeyourgadget.gadgetbridge.DeviceHelper;
import nodomain.freeyourgadget.gadgetbridge.GB;
import nodomain.freeyourgadget.gadgetbridge.GBDevice;
import nodomain.freeyourgadget.gadgetbridge.devices.DeviceCoordinator;
import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
import nodomain.freeyourgadget.gadgetbridge.util.DeviceHelper;
import nodomain.freeyourgadget.gadgetbridge.util.GB;
import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
import nodomain.freeyourgadget.gadgetbridge.R;
import nodomain.freeyourgadget.gadgetbridge.adapter.DeviceCandidateAdapter;
@ -93,7 +94,7 @@ public class DiscoveryActivity extends Activity implements AdapterView.OnItemCli
private ProgressBar progressView;
private BluetoothAdapter adapter;
private ArrayList<DeviceCandidate> deviceCandidates = new ArrayList<>();
private ArrayList<GBDeviceCandidate> deviceCandidates = new ArrayList<>();
private DeviceCandidateAdapter cadidateListAdapter;
private Button startButton;
private Scanning isScanning = Scanning.SCANNING_OFF;
@ -153,7 +154,7 @@ public class DiscoveryActivity extends Activity implements AdapterView.OnItemCli
if (restoredCandidates != null) {
deviceCandidates.clear();
for (Parcelable p : restoredCandidates) {
deviceCandidates.add((DeviceCandidate) p);
deviceCandidates.add((GBDeviceCandidate) p);
}
}
}
@ -174,7 +175,7 @@ public class DiscoveryActivity extends Activity implements AdapterView.OnItemCli
}
private void handleDeviceFound(BluetoothDevice device, short rssi) {
DeviceCandidate candidate = new DeviceCandidate(device, rssi);
GBDeviceCandidate candidate = new GBDeviceCandidate(device, rssi);
if (DeviceHelper.getInstance().isSupported(candidate)) {
int index = deviceCandidates.indexOf(candidate);
if (index >= 0) {
@ -314,7 +315,7 @@ public class DiscoveryActivity extends Activity implements AdapterView.OnItemCli
@Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
DeviceCandidate deviceCandidate = deviceCandidates.get(position);
GBDeviceCandidate deviceCandidate = deviceCandidates.get(position);
if (deviceCandidate == null) {
LOG.error("Device candidate clicked, but item not found");
return;

13
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/FwAppInstallerActivity.java
View File

@ -17,14 +17,13 @@ import android.widget.TextView;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import nodomain.freeyourgadget.gadgetbridge.BluetoothCommunicationService;
import nodomain.freeyourgadget.gadgetbridge.ControlCenter;
import nodomain.freeyourgadget.gadgetbridge.DeviceType;
import nodomain.freeyourgadget.gadgetbridge.GBDevice;
import nodomain.freeyourgadget.gadgetbridge.GBDeviceApp;
import nodomain.freeyourgadget.gadgetbridge.service.BluetoothCommunicationService;
import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceApp;
import nodomain.freeyourgadget.gadgetbridge.R;
import nodomain.freeyourgadget.gadgetbridge.miband.MiBandFWHelper;
import nodomain.freeyourgadget.gadgetbridge.pebble.PBWReader;
import nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandFWHelper;
import nodomain.freeyourgadget.gadgetbridge.devices.pebble.PBWReader;
public class FwAppInstallerActivity extends Activity {

6
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/SettingsActivity.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/SettingsActivity.java
View File

@ -1,11 +1,11 @@
package nodomain.freeyourgadget.gadgetbridge;
package nodomain.freeyourgadget.gadgetbridge.activities;
import android.content.Intent;
import android.os.Bundle;
import android.preference.Preference;
import nodomain.freeyourgadget.gadgetbridge.activities.AbstractSettingsActivity;
import nodomain.freeyourgadget.gadgetbridge.miband.MiBandPreferencesActivity;
import nodomain.freeyourgadget.gadgetbridge.R;
import nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandPreferencesActivity;
public class SettingsActivity extends AbstractSettingsActivity {
@Override

19
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractChartFragment.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/AbstractChartFragment.java
View File

@ -1,4 +1,4 @@
package nodomain.freeyourgadget.gadgetbridge.activities;
package nodomain.freeyourgadget.gadgetbridge.activities.charts;
import android.content.Context;
import android.graphics.Color;
@ -20,16 +20,15 @@ import java.util.Date;
import java.util.GregorianCalendar;
import java.util.List;
import nodomain.freeyourgadget.gadgetbridge.DeviceCoordinator;
import nodomain.freeyourgadget.gadgetbridge.DeviceHelper;
import nodomain.freeyourgadget.gadgetbridge.GBDevice;
import nodomain.freeyourgadget.gadgetbridge.devices.DeviceCoordinator;
import nodomain.freeyourgadget.gadgetbridge.util.DeviceHelper;
import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
import nodomain.freeyourgadget.gadgetbridge.R;
import nodomain.freeyourgadget.gadgetbridge.charts.ActivityKind;
import nodomain.freeyourgadget.gadgetbridge.charts.SleepUtils;
import nodomain.freeyourgadget.gadgetbridge.model.ActivityKind;
import nodomain.freeyourgadget.gadgetbridge.database.DBAccess;
import nodomain.freeyourgadget.gadgetbridge.database.DBHandler;
import nodomain.freeyourgadget.gadgetbridge.model.ActivitySample;
import nodomain.freeyourgadget.gadgetbridge.model.SampleProvider;
import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
public abstract class AbstractChartFragment extends Fragment {
private static final Logger LOG = LoggerFactory.getLogger(ActivitySleepChartFragment.class);
@ -61,11 +60,11 @@ public abstract class AbstractChartFragment extends Fragment {
protected Integer getColorFor(int activityKind) {
switch (activityKind) {
case nodomain.freeyourgadget.gadgetbridge.charts.ActivityKind.TYPE_DEEP_SLEEP:
case ActivityKind.TYPE_DEEP_SLEEP:
return akDeepSleep.color;
case nodomain.freeyourgadget.gadgetbridge.charts.ActivityKind.TYPE_LIGHT_SLEEP:
case ActivityKind.TYPE_LIGHT_SLEEP:
return akLightSleep.color;
case nodomain.freeyourgadget.gadgetbridge.charts.ActivityKind.TYPE_ACTIVITY:
case ActivityKind.TYPE_ACTIVITY:
return akActivity.color;
}
return akActivity.color;

5
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/charts/ActivityAnalysis.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ActivityAnalysis.java
View File

@ -1,7 +1,10 @@
package nodomain.freeyourgadget.gadgetbridge.charts;
package nodomain.freeyourgadget.gadgetbridge.activities.charts;
import java.util.List;
import nodomain.freeyourgadget.gadgetbridge.model.ActivityAmount;
import nodomain.freeyourgadget.gadgetbridge.model.ActivityAmounts;
import nodomain.freeyourgadget.gadgetbridge.model.ActivityKind;
import nodomain.freeyourgadget.gadgetbridge.model.ActivitySample;
public class ActivityAnalysis {

6
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ActivitySleepChartFragment.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ActivitySleepChartFragment.java
View File

@ -1,4 +1,4 @@
package nodomain.freeyourgadget.gadgetbridge.activities;
package nodomain.freeyourgadget.gadgetbridge.activities.charts;
import android.content.BroadcastReceiver;
import android.content.Context;
@ -22,9 +22,9 @@ import org.slf4j.LoggerFactory;
import java.util.ArrayList;
import java.util.List;
import nodomain.freeyourgadget.gadgetbridge.ControlCenter;
import nodomain.freeyourgadget.gadgetbridge.GBDevice;
import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
import nodomain.freeyourgadget.gadgetbridge.R;
import nodomain.freeyourgadget.gadgetbridge.activities.ControlCenter;
import nodomain.freeyourgadget.gadgetbridge.database.DBHandler;
import nodomain.freeyourgadget.gadgetbridge.model.ActivitySample;

8
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ChartsActivity.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ChartsActivity.java
View File

@ -1,4 +1,4 @@
package nodomain.freeyourgadget.gadgetbridge.activities;
package nodomain.freeyourgadget.gadgetbridge.activities.charts;
import android.content.BroadcastReceiver;
import android.content.Context;
@ -22,9 +22,9 @@ import org.slf4j.LoggerFactory;
import java.util.Locale;
import nodomain.freeyourgadget.gadgetbridge.BluetoothCommunicationService;
import nodomain.freeyourgadget.gadgetbridge.ControlCenter;
import nodomain.freeyourgadget.gadgetbridge.GBDevice;
import nodomain.freeyourgadget.gadgetbridge.activities.ControlCenter;
import nodomain.freeyourgadget.gadgetbridge.service.BluetoothCommunicationService;
import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
import nodomain.freeyourgadget.gadgetbridge.R;
public class ChartsActivity extends FragmentActivity {

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/charts/CustomBarChart.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/CustomBarChart.java
View File

@ -1,4 +1,4 @@
package nodomain.freeyourgadget.gadgetbridge.charts;
package nodomain.freeyourgadget.gadgetbridge.activities.charts;
import android.content.Context;
import android.util.AttributeSet;

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/charts/CustomLegendRenderer.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/CustomLegendRenderer.java
View File

@ -1,4 +1,4 @@
package nodomain.freeyourgadget.gadgetbridge.charts;
package nodomain.freeyourgadget.gadgetbridge.activities.charts;
import android.graphics.Typeface;

13
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/SleepChartFragment.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/SleepChartFragment.java
View File

@ -1,4 +1,4 @@
package nodomain.freeyourgadget.gadgetbridge.activities;
package nodomain.freeyourgadget.gadgetbridge.activities.charts;
import android.content.BroadcastReceiver;
import android.content.Context;
@ -28,13 +28,12 @@ import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.TimeUnit;
import nodomain.freeyourgadget.gadgetbridge.ControlCenter;
import nodomain.freeyourgadget.gadgetbridge.GB;
import nodomain.freeyourgadget.gadgetbridge.GBDevice;
import nodomain.freeyourgadget.gadgetbridge.util.GB;
import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
import nodomain.freeyourgadget.gadgetbridge.R;
import nodomain.freeyourgadget.gadgetbridge.charts.ActivityAmount;
import nodomain.freeyourgadget.gadgetbridge.charts.ActivityAmounts;
import nodomain.freeyourgadget.gadgetbridge.charts.ActivityAnalysis;
import nodomain.freeyourgadget.gadgetbridge.activities.ControlCenter;
import nodomain.freeyourgadget.gadgetbridge.model.ActivityAmount;
import nodomain.freeyourgadget.gadgetbridge.model.ActivityAmounts;
import nodomain.freeyourgadget.gadgetbridge.database.DBHandler;
import nodomain.freeyourgadget.gadgetbridge.model.ActivitySample;

4
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/charts/SleepUtils.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/SleepUtils.java
View File

@ -1,4 +1,6 @@
package nodomain.freeyourgadget.gadgetbridge.charts;
package nodomain.freeyourgadget.gadgetbridge.activities.charts;
import nodomain.freeyourgadget.gadgetbridge.model.ActivityKind;
public class SleepUtils {
public static final float Y_VALUE_DEEP_SLEEP = 0.01f;

9
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/WeekStepsChartFragment.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/WeekStepsChartFragment.java
View File

@ -1,4 +1,4 @@
package nodomain.freeyourgadget.gadgetbridge.activities;
package nodomain.freeyourgadget.gadgetbridge.activities.charts;
import android.content.BroadcastReceiver;
import android.content.Context;
@ -33,12 +33,11 @@ import java.util.Calendar;
import java.util.List;
import java.util.Locale;
import nodomain.freeyourgadget.gadgetbridge.ControlCenter;
import nodomain.freeyourgadget.gadgetbridge.GBDevice;
import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
import nodomain.freeyourgadget.gadgetbridge.R;
import nodomain.freeyourgadget.gadgetbridge.charts.ActivityAnalysis;
import nodomain.freeyourgadget.gadgetbridge.activities.ControlCenter;
import nodomain.freeyourgadget.gadgetbridge.database.DBHandler;
import nodomain.freeyourgadget.gadgetbridge.miband.MiBandCoordinator;
import nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandCoordinator;
import nodomain.freeyourgadget.gadgetbridge.model.ActivitySample;

14
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/DeviceCandidateAdapter.java
View File

@ -10,16 +10,16 @@ import android.widget.TextView;
import java.util.List;
import nodomain.freeyourgadget.gadgetbridge.GB;
import nodomain.freeyourgadget.gadgetbridge.GBDevice;
import nodomain.freeyourgadget.gadgetbridge.util.GB;
import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
import nodomain.freeyourgadget.gadgetbridge.R;
import nodomain.freeyourgadget.gadgetbridge.discovery.DeviceCandidate;
import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
public class DeviceCandidateAdapter extends ArrayAdapter<DeviceCandidate> {
public class DeviceCandidateAdapter extends ArrayAdapter<GBDeviceCandidate> {
private final Context context;
public DeviceCandidateAdapter(Context context, List<DeviceCandidate> deviceCandidates) {
public DeviceCandidateAdapter(Context context, List<GBDeviceCandidate> deviceCandidates) {
super(context, 0, deviceCandidates);
this.context = context;
@ -27,7 +27,7 @@ public class DeviceCandidateAdapter extends ArrayAdapter<DeviceCandidate> {
@Override
public View getView(int position, View view, ViewGroup parent) {
DeviceCandidate device = getItem(position);
GBDeviceCandidate device = getItem(position);
if (view == null) {
LayoutInflater inflater = (LayoutInflater) context
@ -57,7 +57,7 @@ public class DeviceCandidateAdapter extends ArrayAdapter<DeviceCandidate> {
return view;
}
private String formatDeviceCandidate(DeviceCandidate device) {
private String formatDeviceCandidate(GBDeviceCandidate device) {
if (device.getRssi() > GBDevice.RSSI_UNKNOWN) {
return context.getString(R.string.device_with_rssi, device.getName(), GB.formatRssi(device.getRssi()));
}

17
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBAlarmListAdapter.java
View File

@ -15,9 +15,10 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.Set;
import nodomain.freeyourgadget.gadgetbridge.GBAlarm;
import nodomain.freeyourgadget.gadgetbridge.impl.GBAlarm;
import nodomain.freeyourgadget.gadgetbridge.R;
import nodomain.freeyourgadget.gadgetbridge.activities.ConfigureAlarms;
import nodomain.freeyourgadget.gadgetbridge.model.Alarm;
public class GBAlarmListAdapter extends ArrayAdapter<GBAlarm> {
@ -109,13 +110,13 @@ public class GBAlarmListAdapter extends ArrayAdapter<GBAlarm> {
Switch isEnabled = (Switch) view.findViewById(R.id.alarm_item_toggle);
TextView isSmartWakeup = (TextView) view.findViewById(R.id.alarm_smart_wakeup);
highlightDay((TextView) view.findViewById(R.id.alarm_item_sunday), alarm.getRepetition(GBAlarm.ALARM_SUN));
highlightDay((TextView) view.findViewById(R.id.alarm_item_monday), alarm.getRepetition(GBAlarm.ALARM_MON));
highlightDay((TextView) view.findViewById(R.id.alarm_item_tuesday), alarm.getRepetition(GBAlarm.ALARM_TUE));
highlightDay((TextView) view.findViewById(R.id.alarm_item_wednesday), alarm.getRepetition(GBAlarm.ALARM_WED));
highlightDay((TextView) view.findViewById(R.id.alarm_item_thursday), alarm.getRepetition(GBAlarm.ALARM_THU));
highlightDay((TextView) view.findViewById(R.id.alarm_item_friday), alarm.getRepetition(GBAlarm.ALARM_FRI));
highlightDay((TextView) view.findViewById(R.id.alarm_item_saturday), alarm.getRepetition(GBAlarm.ALARM_SAT));
highlightDay((TextView) view.findViewById(R.id.alarm_item_sunday), alarm.getRepetition(Alarm.ALARM_SUN));
highlightDay((TextView) view.findViewById(R.id.alarm_item_monday), alarm.getRepetition(Alarm.ALARM_MON));
highlightDay((TextView) view.findViewById(R.id.alarm_item_tuesday), alarm.getRepetition(Alarm.ALARM_TUE));
highlightDay((TextView) view.findViewById(R.id.alarm_item_wednesday), alarm.getRepetition(Alarm.ALARM_WED));
highlightDay((TextView) view.findViewById(R.id.alarm_item_thursday), alarm.getRepetition(Alarm.ALARM_THU));
highlightDay((TextView) view.findViewById(R.id.alarm_item_friday), alarm.getRepetition(Alarm.ALARM_FRI));
highlightDay((TextView) view.findViewById(R.id.alarm_item_saturday), alarm.getRepetition(Alarm.ALARM_SAT));
isEnabled.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBDeviceAdapter.java
View File

@ -11,7 +11,7 @@ import android.widget.TextView;
import java.util.List;
import nodomain.freeyourgadget.gadgetbridge.GBDevice;
import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
import nodomain.freeyourgadget.gadgetbridge.R;
public class GBDeviceAdapter extends ArrayAdapter<GBDevice> {

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBDeviceAppAdapter.java
View File

@ -10,7 +10,7 @@ import android.widget.TextView;
import java.util.List;
import nodomain.freeyourgadget.gadgetbridge.GBDeviceApp;
import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceApp;
import nodomain.freeyourgadget.gadgetbridge.R;
public class GBDeviceAppAdapter extends ArrayAdapter<GBDeviceApp> {

8
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/ActivityDatabaseHandler.java
View File

@ -12,13 +12,13 @@ import org.slf4j.LoggerFactory;
import java.util.ArrayList;
import nodomain.freeyourgadget.gadgetbridge.GB;
import nodomain.freeyourgadget.gadgetbridge.GBActivitySample;
import nodomain.freeyourgadget.gadgetbridge.util.GB;
import nodomain.freeyourgadget.gadgetbridge.impl.GBActivitySample;
import nodomain.freeyourgadget.gadgetbridge.GBApplication;
import nodomain.freeyourgadget.gadgetbridge.charts.ActivityKind;
import nodomain.freeyourgadget.gadgetbridge.model.ActivityKind;
import nodomain.freeyourgadget.gadgetbridge.database.schema.ActivityDBCreationScript;
import nodomain.freeyourgadget.gadgetbridge.model.ActivitySample;
import nodomain.freeyourgadget.gadgetbridge.model.SampleProvider;
import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
import static nodomain.freeyourgadget.gadgetbridge.database.DBConstants.DATABASE_NAME;
import static nodomain.freeyourgadget.gadgetbridge.database.DBConstants.KEY_INTENSITY;

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/DBAccess.java
View File

@ -4,7 +4,7 @@ import android.content.Context;
import android.os.AsyncTask;
import android.widget.Toast;
import nodomain.freeyourgadget.gadgetbridge.GB;
import nodomain.freeyourgadget.gadgetbridge.util.GB;
import nodomain.freeyourgadget.gadgetbridge.GBApplication;
import nodomain.freeyourgadget.gadgetbridge.R;

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/DBHandler.java
View File

@ -7,7 +7,7 @@ import java.util.List;
import nodomain.freeyourgadget.gadgetbridge.GBApplication;
import nodomain.freeyourgadget.gadgetbridge.model.ActivitySample;
import nodomain.freeyourgadget.gadgetbridge.model.SampleProvider;
import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
public interface DBHandler {
public SQLiteOpenHelper getHelper();

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventAppInfo.java
View File

@ -1,6 +1,6 @@
package nodomain.freeyourgadget.gadgetbridge.deviceevents;
import nodomain.freeyourgadget.gadgetbridge.GBDeviceApp;
import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceApp;
public class GBDeviceEventAppInfo extends GBDeviceEvent {
public GBDeviceApp apps[];

11
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/DeviceCoordinator.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceCoordinator.java
View File

@ -1,14 +1,15 @@
package nodomain.freeyourgadget.gadgetbridge;
package nodomain.freeyourgadget.gadgetbridge.devices;
import android.app.Activity;
import nodomain.freeyourgadget.gadgetbridge.discovery.DeviceCandidate;
import nodomain.freeyourgadget.gadgetbridge.model.SampleProvider;
import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
public interface DeviceCoordinator {
String EXTRA_DEVICE_MAC_ADDRESS = "nodomain.freeyourgadget.gadgetbridge.discovery.DeviceCandidate.EXTRA_MAC_ADDRESS";
String EXTRA_DEVICE_MAC_ADDRESS = "nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate.EXTRA_MAC_ADDRESS";
boolean supports(DeviceCandidate candidate);
boolean supports(GBDeviceCandidate candidate);
boolean supports(GBDevice device);

9
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/EventHandler.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/EventHandler.java
View File

@ -1,10 +1,13 @@
package nodomain.freeyourgadget.gadgetbridge;
package nodomain.freeyourgadget.gadgetbridge.devices;
import android.net.Uri;
import java.util.ArrayList;
import java.util.UUID;
import nodomain.freeyourgadget.gadgetbridge.model.ServiceCommand;
import nodomain.freeyourgadget.gadgetbridge.model.Alarm;
/**
* Specifies all events that GadgetBridge intends to send to the gadget device.
* Implementations can decide to ignore events that they do not support.
@ -19,9 +22,9 @@ public interface EventHandler {
void onSetTime(long ts);
void onSetAlarms(ArrayList<GBAlarm> alarms);
void onSetAlarms(ArrayList<Alarm> alarms);
void onSetCallState(String number, String name, GBCommand command);
void onSetCallState(String number, String name, ServiceCommand command);
void onSetMusicInfo(String artist, String album, String track);

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/SampleProvider.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/SampleProvider.java
View File

@ -1,4 +1,4 @@
package nodomain.freeyourgadget.gadgetbridge.model;
package nodomain.freeyourgadget.gadgetbridge.devices;
public interface SampleProvider {
public static final byte PROVIDER_MIBAND = 0;

14
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/UnknownDeviceCoordinator.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/UnknownDeviceCoordinator.java
View File

@ -1,10 +1,12 @@
package nodomain.freeyourgadget.gadgetbridge;
package nodomain.freeyourgadget.gadgetbridge.devices;
import android.app.Activity;
import nodomain.freeyourgadget.gadgetbridge.charts.ActivityKind;
import nodomain.freeyourgadget.gadgetbridge.discovery.DeviceCandidate;
import nodomain.freeyourgadget.gadgetbridge.model.SampleProvider;
import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
import nodomain.freeyourgadget.gadgetbridge.activities.ControlCenter;
import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
import nodomain.freeyourgadget.gadgetbridge.model.ActivityKind;
import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
public class UnknownDeviceCoordinator implements DeviceCoordinator {
private final UnknownSampleProvider sampleProvider;
@ -27,7 +29,7 @@ public class UnknownDeviceCoordinator implements DeviceCoordinator {
@Override
public byte getID() {
return SampleProvider.PROVIDER_UNKNOWN;
return PROVIDER_UNKNOWN;
}
}
@ -36,7 +38,7 @@ public class UnknownDeviceCoordinator implements DeviceCoordinator {
}
@Override
public boolean supports(DeviceCandidate candidate) {
public boolean supports(GBDeviceCandidate candidate) {
return false;
}

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/miband/MiBandConst.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandConst.java
View File

@ -1,4 +1,4 @@
package nodomain.freeyourgadget.gadgetbridge.miband;
package nodomain.freeyourgadget.gadgetbridge.devices.miband;
import android.content.SharedPreferences;

16
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/miband/MiBandCoordinator.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandCoordinator.java
View File

@ -1,4 +1,4 @@
package nodomain.freeyourgadget.gadgetbridge.miband;
package nodomain.freeyourgadget.gadgetbridge.devices.miband;
import android.app.Activity;
import android.content.SharedPreferences;
@ -9,13 +9,13 @@ import org.slf4j.LoggerFactory;
import java.util.Calendar;
import nodomain.freeyourgadget.gadgetbridge.DeviceCoordinator;
import nodomain.freeyourgadget.gadgetbridge.DeviceType;
import nodomain.freeyourgadget.gadgetbridge.devices.DeviceCoordinator;
import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
import nodomain.freeyourgadget.gadgetbridge.GBApplication;
import nodomain.freeyourgadget.gadgetbridge.GBDevice;
import nodomain.freeyourgadget.gadgetbridge.activities.ChartsActivity;
import nodomain.freeyourgadget.gadgetbridge.discovery.DeviceCandidate;
import nodomain.freeyourgadget.gadgetbridge.model.SampleProvider;
import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
import nodomain.freeyourgadget.gadgetbridge.activities.charts.ChartsActivity;
import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
public class MiBandCoordinator implements DeviceCoordinator {
private static final Logger LOG = LoggerFactory.getLogger(MiBandCoordinator.class);
@ -26,7 +26,7 @@ public class MiBandCoordinator implements DeviceCoordinator {
}
@Override
public boolean supports(DeviceCandidate candidate) {
public boolean supports(GBDeviceCandidate candidate) {
return candidate.getMacAddress().toUpperCase().startsWith(MiBandService.MAC_ADDRESS_FILTER);
}

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/miband/MiBandFWHelper.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandFWHelper.java
View File

@ -1,4 +1,4 @@
package nodomain.freeyourgadget.gadgetbridge.miband;
package nodomain.freeyourgadget.gadgetbridge.devices.miband;
import android.content.ContentResolver;
import android.content.Context;

6
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/miband/MiBandNotifyAction.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandNotifyAction.java
View File

@ -1,4 +1,4 @@
package nodomain.freeyourgadget.gadgetbridge.miband;
package nodomain.freeyourgadget.gadgetbridge.devices.miband;
import android.bluetooth.BluetoothGatt;
import android.bluetooth.BluetoothGattCallback;
@ -8,8 +8,8 @@ import android.bluetooth.BluetoothGattDescriptor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import nodomain.freeyourgadget.gadgetbridge.btle.NotifyAction;
import nodomain.freeyourgadget.gadgetbridge.btle.TransactionBuilder;
import nodomain.freeyourgadget.gadgetbridge.service.btle.actions.NotifyAction;
import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
/**
* Enables or disables notifications for a given GATT characteristic.

12
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/miband/MiBandPairingActivity.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandPairingActivity.java
View File

@ -1,4 +1,4 @@
package nodomain.freeyourgadget.gadgetbridge.miband;
package nodomain.freeyourgadget.gadgetbridge.devices.miband;
import android.app.Activity;
import android.content.BroadcastReceiver;
@ -12,12 +12,12 @@ import android.support.v4.content.LocalBroadcastManager;
import android.widget.TextView;
import android.widget.Toast;
import nodomain.freeyourgadget.gadgetbridge.BluetoothCommunicationService;
import nodomain.freeyourgadget.gadgetbridge.ControlCenter;
import nodomain.freeyourgadget.gadgetbridge.DeviceCoordinator;
import nodomain.freeyourgadget.gadgetbridge.GBDevice;
import nodomain.freeyourgadget.gadgetbridge.service.BluetoothCommunicationService;
import nodomain.freeyourgadget.gadgetbridge.activities.ControlCenter;
import nodomain.freeyourgadget.gadgetbridge.devices.DeviceCoordinator;
import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
import nodomain.freeyourgadget.gadgetbridge.R;
import nodomain.freeyourgadget.gadgetbridge.discovery.DiscoveryActivity;
import nodomain.freeyourgadget.gadgetbridge.activities.DiscoveryActivity;
public class MiBandPairingActivity extends Activity {

36
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/miband/MiBandPreferencesActivity.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandPreferencesActivity.java
View File

@ -1,30 +1,30 @@
package nodomain.freeyourgadget.gadgetbridge.miband;
package nodomain.freeyourgadget.gadgetbridge.devices.miband;
import android.content.Intent;
import android.os.Bundle;
import android.preference.Preference;
import android.support.v4.content.LocalBroadcastManager;
import nodomain.freeyourgadget.gadgetbridge.ControlCenter;
import nodomain.freeyourgadget.gadgetbridge.activities.ControlCenter;
import nodomain.freeyourgadget.gadgetbridge.R;
import nodomain.freeyourgadget.gadgetbridge.activities.AbstractSettingsActivity;
import static nodomain.freeyourgadget.gadgetbridge.miband.MiBandConst.ORIGIN_GENERIC;
import static nodomain.freeyourgadget.gadgetbridge.miband.MiBandConst.ORIGIN_INCOMING_CALL;
import static nodomain.freeyourgadget.gadgetbridge.miband.MiBandConst.ORIGIN_K9MAIL;
import static nodomain.freeyourgadget.gadgetbridge.miband.MiBandConst.ORIGIN_PEBBLEMSG;
import static nodomain.freeyourgadget.gadgetbridge.miband.MiBandConst.ORIGIN_SMS;
import static nodomain.freeyourgadget.gadgetbridge.miband.MiBandConst.PREF_MIBAND_ADDRESS;
import static nodomain.freeyourgadget.gadgetbridge.miband.MiBandConst.PREF_MIBAND_FITNESS_GOAL;
import static nodomain.freeyourgadget.gadgetbridge.miband.MiBandConst.PREF_MIBAND_WEARSIDE;
import static nodomain.freeyourgadget.gadgetbridge.miband.MiBandConst.PREF_USER_ALIAS;
import static nodomain.freeyourgadget.gadgetbridge.miband.MiBandConst.PREF_USER_GENDER;
import static nodomain.freeyourgadget.gadgetbridge.miband.MiBandConst.PREF_USER_HEIGHT_CM;
import static nodomain.freeyourgadget.gadgetbridge.miband.MiBandConst.PREF_USER_WEIGHT_KG;
import static nodomain.freeyourgadget.gadgetbridge.miband.MiBandConst.PREF_USER_YEAR_OF_BIRTH;
import static nodomain.freeyourgadget.gadgetbridge.miband.MiBandConst.VIBRATION_COUNT;
import static nodomain.freeyourgadget.gadgetbridge.miband.MiBandConst.VIBRATION_PROFILE;
import static nodomain.freeyourgadget.gadgetbridge.miband.MiBandConst.getNotificationPrefKey;
import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.ORIGIN_GENERIC;
import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.ORIGIN_INCOMING_CALL;
import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.ORIGIN_K9MAIL;
import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.ORIGIN_PEBBLEMSG;
import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.ORIGIN_SMS;
import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.PREF_MIBAND_ADDRESS;
import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.PREF_MIBAND_FITNESS_GOAL;
import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.PREF_MIBAND_WEARSIDE;
import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.PREF_USER_ALIAS;
import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.PREF_USER_GENDER;
import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.PREF_USER_HEIGHT_CM;
import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.PREF_USER_WEIGHT_KG;
import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.PREF_USER_YEAR_OF_BIRTH;
import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.VIBRATION_COUNT;
import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.VIBRATION_PROFILE;
import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.getNotificationPrefKey;
public class MiBandPreferencesActivity extends AbstractSettingsActivity {
@Override

6
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/miband/MiBandSampleProvider.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandSampleProvider.java
View File

@ -1,7 +1,7 @@
package nodomain.freeyourgadget.gadgetbridge.miband;
package nodomain.freeyourgadget.gadgetbridge.devices.miband;
import nodomain.freeyourgadget.gadgetbridge.charts.ActivityKind;
import nodomain.freeyourgadget.gadgetbridge.model.SampleProvider;
import nodomain.freeyourgadget.gadgetbridge.model.ActivityKind;
import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
public class MiBandSampleProvider implements SampleProvider {
public static final byte TYPE_DEEP_SLEEP = 5;

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/miband/MiBandService.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandService.java
View File

@ -1,4 +1,4 @@
package nodomain.freeyourgadget.gadgetbridge.miband;
package nodomain.freeyourgadget.gadgetbridge.devices.miband;
import java.util.HashMap;
import java.util.Map;

6
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/miband/MiBandTransactionBuilder.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandTransactionBuilder.java
View File

@ -1,12 +1,12 @@
package nodomain.freeyourgadget.gadgetbridge.miband;
package nodomain.freeyourgadget.gadgetbridge.devices.miband;
import android.bluetooth.BluetoothGattCharacteristic;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import nodomain.freeyourgadget.gadgetbridge.btle.NotifyAction;
import nodomain.freeyourgadget.gadgetbridge.btle.TransactionBuilder;
import nodomain.freeyourgadget.gadgetbridge.service.btle.actions.NotifyAction;
import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
public class MiBandTransactionBuilder extends TransactionBuilder {
private static final Logger LOG = LoggerFactory.getLogger(MiBandTransactionBuilder.class);

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/miband/UserInfo.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/UserInfo.java
View File

@ -1,4 +1,4 @@
package nodomain.freeyourgadget.gadgetbridge.miband;
package nodomain.freeyourgadget.gadgetbridge.devices.miband;
/**
* Created by UgoRaffaele on 30/01/2015.

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/miband/VibrationProfile.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/VibrationProfile.java
View File

@ -1,4 +1,4 @@
package nodomain.freeyourgadget.gadgetbridge.miband;
package nodomain.freeyourgadget.gadgetbridge.devices.miband;
import android.content.Context;

0
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/miband/miligatt.txt → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/miligatt.txt
View File

6
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/pebble/MorpheuzSampleProvider.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/MorpheuzSampleProvider.java
View File

@ -1,7 +1,7 @@
package nodomain.freeyourgadget.gadgetbridge.pebble;
package nodomain.freeyourgadget.gadgetbridge.devices.pebble;
import nodomain.freeyourgadget.gadgetbridge.charts.ActivityKind;
import nodomain.freeyourgadget.gadgetbridge.model.SampleProvider;
import nodomain.freeyourgadget.gadgetbridge.model.ActivityKind;
import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
public class MorpheuzSampleProvider implements SampleProvider {
// raw types

5
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/pebble/PBWReader.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PBWReader.java
View File

@ -1,4 +1,4 @@
package nodomain.freeyourgadget.gadgetbridge.pebble;
package nodomain.freeyourgadget.gadgetbridge.devices.pebble;
import android.content.ContentResolver;
import android.content.Context;
@ -21,7 +21,8 @@ import java.util.UUID;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
import nodomain.freeyourgadget.gadgetbridge.GBDeviceApp;
import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceApp;
import nodomain.freeyourgadget.gadgetbridge.service.pebble.PebbleProtocol;
public class PBWReader {
private static final Logger LOG = LoggerFactory.getLogger(PBWReader.class);

16
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/pebble/PebbleCoordinator.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleCoordinator.java
View File

@ -1,13 +1,13 @@
package nodomain.freeyourgadget.gadgetbridge.pebble;
package nodomain.freeyourgadget.gadgetbridge.devices.pebble;
import android.app.Activity;
import nodomain.freeyourgadget.gadgetbridge.AppManagerActivity;
import nodomain.freeyourgadget.gadgetbridge.DeviceCoordinator;
import nodomain.freeyourgadget.gadgetbridge.DeviceType;
import nodomain.freeyourgadget.gadgetbridge.GBDevice;
import nodomain.freeyourgadget.gadgetbridge.discovery.DeviceCandidate;
import nodomain.freeyourgadget.gadgetbridge.model.SampleProvider;
import nodomain.freeyourgadget.gadgetbridge.activities.AppManagerActivity;
import nodomain.freeyourgadget.gadgetbridge.devices.DeviceCoordinator;
import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate;
import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
public class PebbleCoordinator implements DeviceCoordinator {
private MorpheuzSampleProvider sampleProvider;
@ -18,7 +18,7 @@ public class PebbleCoordinator implements DeviceCoordinator {
}
@Override
public boolean supports(DeviceCandidate candidate) {
public boolean supports(GBDeviceCandidate candidate) {
return candidate.getName().startsWith("Pebble");
}

4
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/pebble/PebbleGadgetBridgeSampleProvider.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleGadgetBridgeSampleProvider.java
View File

@ -1,6 +1,6 @@
package nodomain.freeyourgadget.gadgetbridge.pebble;
package nodomain.freeyourgadget.gadgetbridge.devices.pebble;
import nodomain.freeyourgadget.gadgetbridge.model.SampleProvider;
import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
public class PebbleGadgetBridgeSampleProvider extends MorpheuzSampleProvider {
public PebbleGadgetBridgeSampleProvider() {

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/pebble/PebbleInstallable.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleInstallable.java
View File

@ -1,4 +1,4 @@
package nodomain.freeyourgadget.gadgetbridge.pebble;
package nodomain.freeyourgadget.gadgetbridge.devices.pebble;
public class PebbleInstallable {
final private byte type;

4
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/BluetoothStateChangeReceiver.java
View File

@ -8,8 +8,8 @@ import android.content.SharedPreferences;
import android.preference.PreferenceManager;
import android.support.v4.content.LocalBroadcastManager;
import nodomain.freeyourgadget.gadgetbridge.BluetoothCommunicationService;
import nodomain.freeyourgadget.gadgetbridge.ControlCenter;
import nodomain.freeyourgadget.gadgetbridge.service.BluetoothCommunicationService;
import nodomain.freeyourgadget.gadgetbridge.activities.ControlCenter;
public class BluetoothStateChangeReceiver extends BroadcastReceiver {
@Override

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/K9Receiver.java
View File

@ -12,7 +12,7 @@ import android.preference.PreferenceManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import nodomain.freeyourgadget.gadgetbridge.BluetoothCommunicationService;
import nodomain.freeyourgadget.gadgetbridge.service.BluetoothCommunicationService;
public class K9Receiver extends BroadcastReceiver {

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/MusicPlaybackReceiver.java
View File

@ -7,7 +7,7 @@ import android.content.Intent;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import nodomain.freeyourgadget.gadgetbridge.BluetoothCommunicationService;
import nodomain.freeyourgadget.gadgetbridge.service.BluetoothCommunicationService;
public class MusicPlaybackReceiver extends BroadcastReceiver {
private static final Logger LOG = LoggerFactory.getLogger(MusicPlaybackReceiver.class);

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java
View File

@ -17,7 +17,7 @@ import android.support.v4.content.LocalBroadcastManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import nodomain.freeyourgadget.gadgetbridge.BluetoothCommunicationService;
import nodomain.freeyourgadget.gadgetbridge.service.BluetoothCommunicationService;
public class NotificationListener extends NotificationListenerService {

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/PebbleReceiver.java
View File

@ -12,7 +12,7 @@ import org.json.JSONException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import nodomain.freeyourgadget.gadgetbridge.BluetoothCommunicationService;
import nodomain.freeyourgadget.gadgetbridge.service.BluetoothCommunicationService;
public class PebbleReceiver extends BroadcastReceiver {

16
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/PhoneCallReceiver.java
View File

@ -5,8 +5,8 @@ import android.content.Context;
import android.content.Intent;
import android.telephony.TelephonyManager;
import nodomain.freeyourgadget.gadgetbridge.BluetoothCommunicationService;
import nodomain.freeyourgadget.gadgetbridge.GBCommand;
import nodomain.freeyourgadget.gadgetbridge.service.BluetoothCommunicationService;
import nodomain.freeyourgadget.gadgetbridge.model.ServiceCommand;
public class PhoneCallReceiver extends BroadcastReceiver {
@ -39,25 +39,25 @@ public class PhoneCallReceiver extends BroadcastReceiver {
return;
}
GBCommand callCommand = null;
ServiceCommand callCommand = null;
switch (state) {
case TelephonyManager.CALL_STATE_RINGING:
mSavedNumber = number;
callCommand = GBCommand.CALL_INCOMING;
callCommand = ServiceCommand.CALL_INCOMING;
break;
case TelephonyManager.CALL_STATE_OFFHOOK:
if (mLastState == TelephonyManager.CALL_STATE_RINGING) {
callCommand = GBCommand.CALL_START;
callCommand = ServiceCommand.CALL_START;
} else {
callCommand = GBCommand.CALL_OUTGOING;
callCommand = ServiceCommand.CALL_OUTGOING;
}
break;
case TelephonyManager.CALL_STATE_IDLE:
if (mLastState == TelephonyManager.CALL_STATE_RINGING) {
//missed call would be correct here
callCommand = GBCommand.CALL_END;
callCommand = ServiceCommand.CALL_END;
} else {
callCommand = GBCommand.CALL_END;
callCommand = ServiceCommand.CALL_END;
}
break;
}

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/SMSReceiver.java
View File

@ -9,7 +9,7 @@ import android.os.PowerManager;
import android.preference.PreferenceManager;
import android.telephony.SmsMessage;
import nodomain.freeyourgadget.gadgetbridge.BluetoothCommunicationService;
import nodomain.freeyourgadget.gadgetbridge.service.BluetoothCommunicationService;
public class SMSReceiver extends BroadcastReceiver {

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/TimeChangeReceiver.java
View File

@ -9,7 +9,7 @@ import android.preference.PreferenceManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import nodomain.freeyourgadget.gadgetbridge.BluetoothCommunicationService;
import nodomain.freeyourgadget.gadgetbridge.service.BluetoothCommunicationService;
public class TimeChangeReceiver extends BroadcastReceiver {

4
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBActivitySample.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBActivitySample.java
View File

@ -1,7 +1,7 @@
package nodomain.freeyourgadget.gadgetbridge;
package nodomain.freeyourgadget.gadgetbridge.impl;
import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
import nodomain.freeyourgadget.gadgetbridge.model.ActivitySample;
import nodomain.freeyourgadget.gadgetbridge.model.SampleProvider;
public class GBActivitySample implements ActivitySample {
private final int timestamp;

32
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBAlarm.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBAlarm.java
View File

@ -1,8 +1,7 @@
package nodomain.freeyourgadget.gadgetbridge;
package nodomain.freeyourgadget.gadgetbridge.impl;
import android.content.SharedPreferences;
import android.os.Parcel;
import android.os.Parcelable;
import android.preference.PreferenceManager;
import java.util.Calendar;
@ -10,10 +9,13 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
import static nodomain.freeyourgadget.gadgetbridge.miband.MiBandConst.PREF_MIBAND_ALARMS;
import nodomain.freeyourgadget.gadgetbridge.GBApplication;
import nodomain.freeyourgadget.gadgetbridge.model.Alarm;
import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.PREF_MIBAND_ALARMS;
public class GBAlarm implements Parcelable, Comparable {
public class GBAlarm implements Alarm {
private int index;
private boolean enabled;
@ -22,15 +24,6 @@ public class GBAlarm implements Parcelable, Comparable {
private int hour;
private int minute;
public static final byte ALARM_ONCE = 0;
public static final byte ALARM_MON = 1;
public static final byte ALARM_TUE = 2;
public static final byte ALARM_WED = 4;
public static final byte ALARM_THU = 8;
public static final byte ALARM_FRI = 16;
public static final byte ALARM_SAT = 32;
public static final byte ALARM_SUN = 64;
public static final String[] DEFAULT_ALARMS = {"2,false,false,0,15,30", "1,false,false,96,8,0", "0,false,true,31,7,30"};
@ -95,19 +88,21 @@ public class GBAlarm implements Parcelable, Comparable {
}
@Override
public int compareTo(Object another) {
if (this.getIndex() < ((GBAlarm) another).getIndex()) {
public int compareTo(Alarm another) {
if (this.getIndex() < another.getIndex()) {
return -1;
} else if (this.getIndex() > ((GBAlarm) another).getIndex()) {
} else if (this.getIndex() > another.getIndex()) {
return 1;
}
return 0;
}
@Override
public int getIndex() {
return this.index;
}
@Override
public String getTime() {
return String.format("%02d", this.hour) + ":" + String.format("%02d", this.minute);
}
@ -120,6 +115,7 @@ public class GBAlarm implements Parcelable, Comparable {
return this.minute;
}
@Override
public Calendar getAlarmCal() {
Calendar alarm = Calendar.getInstance();
@ -133,18 +129,22 @@ public class GBAlarm implements Parcelable, Comparable {
return alarm;
}
@Override
public boolean isEnabled() {
return this.enabled;
}
@Override
public boolean isSmartWakeup() {
return this.smartWakeup;
}
@Override
public boolean getRepetition(int dow) {
return (this.repetition & dow) > 0;
}
@Override
public int getRepetitionMask() {
return this.repetition;
}

6
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBDevice.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDevice.java
View File

@ -1,4 +1,4 @@
package nodomain.freeyourgadget.gadgetbridge;
package nodomain.freeyourgadget.gadgetbridge.impl;
import android.content.Context;
import android.content.Intent;
@ -9,6 +9,10 @@ import android.support.v4.content.LocalBroadcastManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
import nodomain.freeyourgadget.gadgetbridge.GBApplication;
import nodomain.freeyourgadget.gadgetbridge.R;
public class GBDevice implements Parcelable {
public static final String ACTION_DEVICE_CHANGED
= "nodomain.freeyourgadget.gadgetbridge.gbdevice.action.device_changed";

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBDeviceApp.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDeviceApp.java
View File

@ -1,4 +1,4 @@
package nodomain.freeyourgadget.gadgetbridge;
package nodomain.freeyourgadget.gadgetbridge.impl;
import java.util.UUID;

12
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/discovery/DeviceCandidate.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDeviceCandidate.java
View File

@ -1,26 +1,26 @@
package nodomain.freeyourgadget.gadgetbridge.discovery;
package nodomain.freeyourgadget.gadgetbridge.impl;
import android.bluetooth.BluetoothDevice;
import android.os.Parcel;
import android.os.Parcelable;
import nodomain.freeyourgadget.gadgetbridge.DeviceType;
import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
import nodomain.freeyourgadget.gadgetbridge.GBApplication;
import nodomain.freeyourgadget.gadgetbridge.R;
/**
*/
public class DeviceCandidate implements Parcelable {
public class GBDeviceCandidate implements Parcelable {
private BluetoothDevice device;
private short rssi;
private DeviceType deviceType = DeviceType.UNKNOWN;
public DeviceCandidate(BluetoothDevice device, short rssi) {
public GBDeviceCandidate(BluetoothDevice device, short rssi) {
this.device = device;
this.rssi = rssi;
}
private DeviceCandidate(Parcel in) {
private GBDeviceCandidate(Parcel in) {
device = in.readParcelable(getClass().getClassLoader());
rssi = (short) in.readInt();
deviceType = DeviceType.valueOf(in.readString());
@ -74,7 +74,7 @@ public class DeviceCandidate implements Parcelable {
return false;
}
DeviceCandidate that = (DeviceCandidate) o;
GBDeviceCandidate that = (GBDeviceCandidate) o;
return device.getAddress().equals(that.device.getAddress());
}

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/GBSummaryOfDay.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBSummaryOfDay.java
View File

@ -1,4 +1,4 @@
package nodomain.freeyourgadget.gadgetbridge.database;
package nodomain.freeyourgadget.gadgetbridge.impl;
import nodomain.freeyourgadget.gadgetbridge.model.SummaryOfDay;

4
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/charts/ActivityAmount.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityAmount.java
View File

@ -1,7 +1,9 @@
package nodomain.freeyourgadget.gadgetbridge.charts;
package nodomain.freeyourgadget.gadgetbridge.model;
import android.content.Context;
import nodomain.freeyourgadget.gadgetbridge.model.ActivityKind;
public class ActivityAmount {
private int activityKind;
private short percent;

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/charts/ActivityAmounts.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityAmounts.java
View File

@ -1,4 +1,4 @@
package nodomain.freeyourgadget.gadgetbridge.charts;
package nodomain.freeyourgadget.gadgetbridge.model;
import java.util.ArrayList;
import java.util.List;

4
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/charts/ActivityKind.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityKind.java
View File

@ -1,8 +1,8 @@
package nodomain.freeyourgadget.gadgetbridge.charts;
package nodomain.freeyourgadget.gadgetbridge.model;
import java.util.Arrays;
import nodomain.freeyourgadget.gadgetbridge.model.SampleProvider;
import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
public class ActivityKind {
public static final int TYPE_UNKNOWN = 0;

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivitySample.java
View File

@ -1,6 +1,6 @@
package nodomain.freeyourgadget.gadgetbridge.model;
import nodomain.freeyourgadget.gadgetbridge.charts.ActivityKind;
import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
public interface ActivitySample {
/**

30
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/Alarm.java Normal file
View File

@ -0,0 +1,30 @@
package nodomain.freeyourgadget.gadgetbridge.model;
import android.os.Parcelable;
import java.util.Calendar;
public interface Alarm extends Parcelable, Comparable<Alarm> {
public static final byte ALARM_ONCE = 0;
public static final byte ALARM_MON = 1;
public static final byte ALARM_TUE = 2;
public static final byte ALARM_WED = 4;
public static final byte ALARM_THU = 8;
public static final byte ALARM_FRI = 16;
public static final byte ALARM_SAT = 32;
public static final byte ALARM_SUN = 64;
int getIndex();
Calendar getAlarmCal();
String getTime();
boolean isEnabled();
boolean isSmartWakeup();
int getRepetitionMask();
boolean getRepetition(int dow);
}

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/DeviceType.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java
View File

@ -1,4 +1,4 @@
package nodomain.freeyourgadget.gadgetbridge;
package nodomain.freeyourgadget.gadgetbridge.model;
public enum DeviceType {
UNKNOWN,

4
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBCommand.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ServiceCommand.java
View File

@ -1,6 +1,6 @@
package nodomain.freeyourgadget.gadgetbridge;
package nodomain.freeyourgadget.gadgetbridge.model;
public enum GBCommand {
public enum ServiceCommand {
UNDEFINEND,

7
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/AbstractBTDeviceSupport.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/AbstractBTDeviceSupport.java
View File

@ -1,13 +1,14 @@
package nodomain.freeyourgadget.gadgetbridge;
package nodomain.freeyourgadget.gadgetbridge.service;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.UUID;
import nodomain.freeyourgadget.gadgetbridge.devices.EventHandler;
import nodomain.freeyourgadget.gadgetbridge.model.ServiceCommand;
import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEvent;
import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventSendBytes;
import nodomain.freeyourgadget.gadgetbridge.protocol.GBDeviceProtocol;
/**
* An abstract base class for all devices connected via Bluetooth
@ -134,7 +135,7 @@ public abstract class AbstractBTDeviceSupport extends AbstractDeviceSupport {
}
@Override
public void onSetCallState(String number, String name, GBCommand command) {
public void onSetCallState(String number, String name, ServiceCommand command) {
byte[] bytes = gbDeviceProtocol.encodeSetCallState(number, name, command);
sendToDevice(bytes);
}

10
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/AbstractDeviceSupport.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/AbstractDeviceSupport.java
View File

@ -1,4 +1,4 @@
package nodomain.freeyourgadget.gadgetbridge;
package nodomain.freeyourgadget.gadgetbridge.service;
import android.app.Notification;
import android.app.NotificationManager;
@ -18,7 +18,13 @@ import java.io.File;
import java.text.SimpleDateFormat;
import java.util.Date;
import nodomain.freeyourgadget.gadgetbridge.activities.AbstractChartFragment;
import nodomain.freeyourgadget.gadgetbridge.activities.AppManagerActivity;
import nodomain.freeyourgadget.gadgetbridge.util.GB;
import nodomain.freeyourgadget.gadgetbridge.service.receivers.GBCallControlReceiver;
import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
import nodomain.freeyourgadget.gadgetbridge.service.receivers.GBMusicControlReceiver;
import nodomain.freeyourgadget.gadgetbridge.R;
import nodomain.freeyourgadget.gadgetbridge.activities.charts.AbstractChartFragment;
import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEvent;
import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventAppInfo;
import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventCallControl;

18
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/BluetoothCommunicationService.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/BluetoothCommunicationService.java
View File

@ -1,4 +1,4 @@
package nodomain.freeyourgadget.gadgetbridge;
package nodomain.freeyourgadget.gadgetbridge.service;
import android.app.NotificationManager;
import android.app.Service;
@ -24,9 +24,15 @@ import org.slf4j.LoggerFactory;
import java.util.ArrayList;
import java.util.UUID;
import nodomain.freeyourgadget.gadgetbridge.GBDevice.State;
import nodomain.freeyourgadget.gadgetbridge.miband.MiBandSupport;
import nodomain.freeyourgadget.gadgetbridge.pebble.PebbleSupport;
import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
import nodomain.freeyourgadget.gadgetbridge.util.GB;
import nodomain.freeyourgadget.gadgetbridge.model.ServiceCommand;
import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice.State;
import nodomain.freeyourgadget.gadgetbridge.R;
import nodomain.freeyourgadget.gadgetbridge.model.Alarm;
import nodomain.freeyourgadget.gadgetbridge.service.miband.MiBandSupport;
import nodomain.freeyourgadget.gadgetbridge.service.pebble.PebbleSupport;
public class BluetoothCommunicationService extends Service {
public static final String ACTION_START
@ -219,7 +225,7 @@ public class BluetoothCommunicationService extends Service {
break;
}
case ACTION_CALLSTATE:
GBCommand command = GBCommand.values()[intent.getIntExtra("call_command", 0)]; // UGLY
ServiceCommand command = ServiceCommand.values()[intent.getIntExtra("call_command", 0)]; // UGLY
String phoneNumber = intent.getStringExtra("call_phonenumber");
String callerName = null;
@ -270,7 +276,7 @@ public class BluetoothCommunicationService extends Service {
mStarted = true;
break;
case ACTION_SET_ALARMS:
ArrayList<GBAlarm> alarms = intent.getParcelableArrayListExtra("alarms");
ArrayList<Alarm> alarms = intent.getParcelableArrayListExtra("alarms");
mDeviceSupport.onSetAlarms(alarms);
break;
}

5
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/DeviceSupport.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceSupport.java
View File

@ -1,8 +1,11 @@
package nodomain.freeyourgadget.gadgetbridge;
package nodomain.freeyourgadget.gadgetbridge.service;
import android.bluetooth.BluetoothAdapter;
import android.content.Context;
import nodomain.freeyourgadget.gadgetbridge.devices.EventHandler;
import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
/**
* Provides the communication support for a specific device. Instances will <b>only</b>
* be used inside the BluetoothCommunicationService. Has hooks to manage the life cycle

4
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBDeviceIoThread.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/GBDeviceIoThread.java
View File

@ -1,7 +1,9 @@
package nodomain.freeyourgadget.gadgetbridge;
package nodomain.freeyourgadget.gadgetbridge.service;
import android.content.Context;
import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
public abstract class GBDeviceIoThread extends Thread {
protected final GBDevice gbDevice;
private final Context context;

6
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/protocol/GBDeviceProtocol.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/GBDeviceProtocol.java
View File

@ -1,8 +1,8 @@
package nodomain.freeyourgadget.gadgetbridge.protocol;
package nodomain.freeyourgadget.gadgetbridge.service;
import java.util.UUID;
import nodomain.freeyourgadget.gadgetbridge.GBCommand;
import nodomain.freeyourgadget.gadgetbridge.model.ServiceCommand;
import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEvent;
public abstract class GBDeviceProtocol {
@ -23,7 +23,7 @@ public abstract class GBDeviceProtocol {
return null;
}
public byte[] encodeSetCallState(String number, String name, GBCommand command) {
public byte[] encodeSetCallState(String number, String name, ServiceCommand command) {
return null;
}

10
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/ServiceDeviceSupport.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/ServiceDeviceSupport.java
View File

@ -1,4 +1,4 @@
package nodomain.freeyourgadget.gadgetbridge;
package nodomain.freeyourgadget.gadgetbridge.service;
import android.bluetooth.BluetoothAdapter;
import android.content.Context;
@ -10,6 +10,10 @@ import org.slf4j.LoggerFactory;
import java.util.ArrayList;
import java.util.UUID;
import nodomain.freeyourgadget.gadgetbridge.model.ServiceCommand;
import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
import nodomain.freeyourgadget.gadgetbridge.model.Alarm;
/**
* Wraps another device support instance and supports busy-checking and throttling of events.
*/
@ -125,7 +129,7 @@ public class ServiceDeviceSupport implements DeviceSupport {
// No throttling for the other events
@Override
public void onSetCallState(String number, String name, GBCommand command) {
public void onSetCallState(String number, String name, ServiceCommand command) {
if (checkBusy("set call state")) {
return;
}
@ -229,7 +233,7 @@ public class ServiceDeviceSupport implements DeviceSupport {
}
@Override
public void onSetAlarms(ArrayList<GBAlarm> alarms) {
public void onSetAlarms(ArrayList<Alarm> alarms) {
if (checkBusy("set alarms")) {
return;
}

4
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/btle/AbstractBTLEDeviceSupport.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/AbstractBTLEDeviceSupport.java
View File

@ -1,4 +1,4 @@
package nodomain.freeyourgadget.gadgetbridge.btle;
package nodomain.freeyourgadget.gadgetbridge.service.btle;
import android.bluetooth.BluetoothGatt;
import android.bluetooth.BluetoothGattCharacteristic;
@ -15,7 +15,7 @@ import java.util.List;
import java.util.Set;
import java.util.UUID;
import nodomain.freeyourgadget.gadgetbridge.AbstractDeviceSupport;
import nodomain.freeyourgadget.gadgetbridge.service.AbstractDeviceSupport;
/**
* Abstract base class for all devices connected through Bluetooth Low Energy (LE) aka

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/btle/BtLEAction.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BtLEAction.java
View File

@ -1,4 +1,4 @@
package nodomain.freeyourgadget.gadgetbridge.btle;
package nodomain.freeyourgadget.gadgetbridge.service.btle;
import android.bluetooth.BluetoothGatt;
import android.bluetooth.BluetoothGattCharacteristic;

8
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/btle/BtLEQueue.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BtLEQueue.java
View File

@ -1,4 +1,4 @@
package nodomain.freeyourgadget.gadgetbridge.btle;
package nodomain.freeyourgadget.gadgetbridge.service.btle;
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothDevice;
@ -19,9 +19,9 @@ import java.util.concurrent.BlockingQueue;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.LinkedBlockingQueue;
import nodomain.freeyourgadget.gadgetbridge.DeviceSupport;
import nodomain.freeyourgadget.gadgetbridge.GBDevice;
import nodomain.freeyourgadget.gadgetbridge.GBDevice.State;
import nodomain.freeyourgadget.gadgetbridge.service.DeviceSupport;
import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice.State;
/**
* One queue/thread per connectable device.

5
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/btle/CheckInitializedAction.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/CheckInitializedAction.java
View File

@ -1,9 +1,10 @@
package nodomain.freeyourgadget.gadgetbridge.btle;
package nodomain.freeyourgadget.gadgetbridge.service.btle;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import nodomain.freeyourgadget.gadgetbridge.GBDevice;
import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
import nodomain.freeyourgadget.gadgetbridge.service.btle.actions.AbortTransactionAction;
/**
* A special action that is executed at the very front of the initialization

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/btle/GattCallback.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/GattCallback.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package nodomain.freeyourgadget.gadgetbridge.btle;
package nodomain.freeyourgadget.gadgetbridge.service.btle;
import android.bluetooth.BluetoothGatt;
import android.bluetooth.BluetoothGattCallback;

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/btle/Transaction.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/Transaction.java
View File

@ -1,4 +1,4 @@
package nodomain.freeyourgadget.gadgetbridge.btle;
package nodomain.freeyourgadget.gadgetbridge.service.btle;
import java.text.DateFormat;
import java.util.ArrayList;

7
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/btle/TransactionBuilder.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/TransactionBuilder.java
View File

@ -1,10 +1,15 @@
package nodomain.freeyourgadget.gadgetbridge.btle;
package nodomain.freeyourgadget.gadgetbridge.service.btle;
import android.bluetooth.BluetoothGattCharacteristic;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import nodomain.freeyourgadget.gadgetbridge.service.btle.actions.NotifyAction;
import nodomain.freeyourgadget.gadgetbridge.service.btle.actions.ReadAction;
import nodomain.freeyourgadget.gadgetbridge.service.btle.actions.WaitAction;
import nodomain.freeyourgadget.gadgetbridge.service.btle.actions.WriteAction;
public class TransactionBuilder {
private static final Logger LOG = LoggerFactory.getLogger(TransactionBuilder.class);

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/btle/AbortTransactionAction.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/AbortTransactionAction.java
View File

@ -1,4 +1,4 @@
package nodomain.freeyourgadget.gadgetbridge.btle;
package nodomain.freeyourgadget.gadgetbridge.service.btle.actions;
import android.bluetooth.BluetoothGatt;

5
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/btle/NotifyAction.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/NotifyAction.java
View File

@ -1,4 +1,4 @@
package nodomain.freeyourgadget.gadgetbridge.btle;
package nodomain.freeyourgadget.gadgetbridge.service.btle.actions;
import android.bluetooth.BluetoothGatt;
import android.bluetooth.BluetoothGattCallback;
@ -7,6 +7,9 @@ import android.bluetooth.BluetoothGattCharacteristic;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import nodomain.freeyourgadget.gadgetbridge.service.btle.BtLEAction;
import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
/**
* Enables or disables notifications for a given GATT characteristic.
* The result will be made available asynchronously through the

4
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/btle/PlainAction.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/PlainAction.java
View File

@ -1,4 +1,6 @@
package nodomain.freeyourgadget.gadgetbridge.btle;
package nodomain.freeyourgadget.gadgetbridge.service.btle.actions;
import nodomain.freeyourgadget.gadgetbridge.service.btle.BtLEAction;
/**
* An abstract non-BTLE action. It performs no bluetooth operation,

4
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/btle/ReadAction.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/ReadAction.java
View File

@ -1,9 +1,11 @@
package nodomain.freeyourgadget.gadgetbridge.btle;
package nodomain.freeyourgadget.gadgetbridge.service.btle.actions;
import android.bluetooth.BluetoothGatt;
import android.bluetooth.BluetoothGattCallback;
import android.bluetooth.BluetoothGattCharacteristic;
import nodomain.freeyourgadget.gadgetbridge.service.btle.BtLEAction;
/**
* Invokes a read operation on a given GATT characteristic.
* The result will be made available asynchronously through the

4
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/btle/SetDeviceBusyAction.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/SetDeviceBusyAction.java
View File

@ -1,9 +1,9 @@
package nodomain.freeyourgadget.gadgetbridge.btle;
package nodomain.freeyourgadget.gadgetbridge.service.btle.actions;
import android.bluetooth.BluetoothGatt;
import android.content.Context;
import nodomain.freeyourgadget.gadgetbridge.GBDevice;
import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
public class SetDeviceBusyAction extends PlainAction {
private final GBDevice device;

5
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/miband/SetDeviceStateAction.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/SetDeviceStateAction.java
View File

@ -1,10 +1,9 @@
package nodomain.freeyourgadget.gadgetbridge.miband;
package nodomain.freeyourgadget.gadgetbridge.service.btle.actions;
import android.bluetooth.BluetoothGatt;
import android.content.Context;
import nodomain.freeyourgadget.gadgetbridge.GBDevice;
import nodomain.freeyourgadget.gadgetbridge.btle.PlainAction;
import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
public class SetDeviceStateAction extends PlainAction {
private final GBDevice device;

4
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/btle/SetProgressAction.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/SetProgressAction.java
View File

@ -1,9 +1,9 @@
package nodomain.freeyourgadget.gadgetbridge.btle;
package nodomain.freeyourgadget.gadgetbridge.service.btle.actions;
import android.bluetooth.BluetoothGatt;
import android.content.Context;
import nodomain.freeyourgadget.gadgetbridge.GB;
import nodomain.freeyourgadget.gadgetbridge.util.GB;
public class SetProgressAction extends PlainAction {

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/btle/WaitAction.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/WaitAction.java
View File

@ -1,4 +1,4 @@
package nodomain.freeyourgadget.gadgetbridge.btle;
package nodomain.freeyourgadget.gadgetbridge.service.btle.actions;
import android.bluetooth.BluetoothGatt;

4
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/btle/WriteAction.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/actions/WriteAction.java
View File

@ -1,9 +1,11 @@
package nodomain.freeyourgadget.gadgetbridge.btle;
package nodomain.freeyourgadget.gadgetbridge.service.btle.actions;
import android.bluetooth.BluetoothGatt;
import android.bluetooth.BluetoothGattCallback;
import android.bluetooth.BluetoothGattCharacteristic;
import nodomain.freeyourgadget.gadgetbridge.service.btle.BtLEAction;
/**
* Invokes a write operation on a given GATT characteristic.
* The result status will be made available asynchronously through the

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/miband/AbstractInfo.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/miband/AbstractInfo.java
View File

@ -1,4 +1,4 @@
package nodomain.freeyourgadget.gadgetbridge.miband;
package nodomain.freeyourgadget.gadgetbridge.service.miband;
public class AbstractInfo {
protected byte[] mData;

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/miband/BatteryInfo.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/miband/BatteryInfo.java
View File

@ -1,4 +1,4 @@
package nodomain.freeyourgadget.gadgetbridge.miband;
package nodomain.freeyourgadget.gadgetbridge.service.miband;
import nodomain.freeyourgadget.gadgetbridge.GBApplication;
import nodomain.freeyourgadget.gadgetbridge.R;

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/miband/DeviceInfo.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/miband/DeviceInfo.java
View File

@ -1,4 +1,4 @@
package nodomain.freeyourgadget.gadgetbridge.miband;
package nodomain.freeyourgadget.gadgetbridge.service.miband;
import java.util.Locale;

85
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/miband/MiBandSupport.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/miband/MiBandSupport.java
View File

@ -1,4 +1,4 @@
package nodomain.freeyourgadget.gadgetbridge.miband;
package nodomain.freeyourgadget.gadgetbridge.service.miband;
import android.bluetooth.BluetoothGatt;
import android.bluetooth.BluetoothGattCharacteristic;
@ -20,42 +20,49 @@ import java.util.GregorianCalendar;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
import nodomain.freeyourgadget.gadgetbridge.GB;
import nodomain.freeyourgadget.gadgetbridge.GBAlarm;
import nodomain.freeyourgadget.gadgetbridge.util.GB;
import nodomain.freeyourgadget.gadgetbridge.GBApplication;
import nodomain.freeyourgadget.gadgetbridge.GBCommand;
import nodomain.freeyourgadget.gadgetbridge.GBDevice.State;
import nodomain.freeyourgadget.gadgetbridge.model.ServiceCommand;
import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice.State;
import nodomain.freeyourgadget.gadgetbridge.R;
import nodomain.freeyourgadget.gadgetbridge.btle.AbortTransactionAction;
import nodomain.freeyourgadget.gadgetbridge.btle.AbstractBTLEDeviceSupport;
import nodomain.freeyourgadget.gadgetbridge.btle.BtLEAction;
import nodomain.freeyourgadget.gadgetbridge.btle.SetDeviceBusyAction;
import nodomain.freeyourgadget.gadgetbridge.btle.SetProgressAction;
import nodomain.freeyourgadget.gadgetbridge.btle.TransactionBuilder;
import nodomain.freeyourgadget.gadgetbridge.database.DBHandler;
import nodomain.freeyourgadget.gadgetbridge.model.SampleProvider;
import nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst;
import nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandCoordinator;
import nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandFWHelper;
import nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandService;
import nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandTransactionBuilder;
import nodomain.freeyourgadget.gadgetbridge.devices.miband.VibrationProfile;
import nodomain.freeyourgadget.gadgetbridge.model.Alarm;
import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
import nodomain.freeyourgadget.gadgetbridge.service.btle.AbstractBTLEDeviceSupport;
import nodomain.freeyourgadget.gadgetbridge.service.btle.BtLEAction;
import nodomain.freeyourgadget.gadgetbridge.service.btle.TransactionBuilder;
import nodomain.freeyourgadget.gadgetbridge.service.btle.actions.AbortTransactionAction;
import nodomain.freeyourgadget.gadgetbridge.service.btle.actions.SetDeviceBusyAction;
import nodomain.freeyourgadget.gadgetbridge.service.btle.actions.SetDeviceStateAction;
import nodomain.freeyourgadget.gadgetbridge.service.btle.actions.SetProgressAction;
import static nodomain.freeyourgadget.gadgetbridge.miband.MiBandConst.DEFAULT_VALUE_FLASH_COLOUR;
import static nodomain.freeyourgadget.gadgetbridge.miband.MiBandConst.DEFAULT_VALUE_FLASH_COUNT;
import static nodomain.freeyourgadget.gadgetbridge.miband.MiBandConst.DEFAULT_VALUE_FLASH_DURATION;
import static nodomain.freeyourgadget.gadgetbridge.miband.MiBandConst.DEFAULT_VALUE_FLASH_ORIGINAL_COLOUR;
import static nodomain.freeyourgadget.gadgetbridge.miband.MiBandConst.DEFAULT_VALUE_VIBRATION_COUNT;
import static nodomain.freeyourgadget.gadgetbridge.miband.MiBandConst.DEFAULT_VALUE_VIBRATION_DURATION;
import static nodomain.freeyourgadget.gadgetbridge.miband.MiBandConst.DEFAULT_VALUE_VIBRATION_PAUSE;
import static nodomain.freeyourgadget.gadgetbridge.miband.MiBandConst.DEFAULT_VALUE_VIBRATION_PROFILE;
import static nodomain.freeyourgadget.gadgetbridge.miband.MiBandConst.FLASH_COLOUR;
import static nodomain.freeyourgadget.gadgetbridge.miband.MiBandConst.FLASH_COUNT;
import static nodomain.freeyourgadget.gadgetbridge.miband.MiBandConst.FLASH_DURATION;
import static nodomain.freeyourgadget.gadgetbridge.miband.MiBandConst.FLASH_ORIGINAL_COLOUR;
import static nodomain.freeyourgadget.gadgetbridge.miband.MiBandConst.ORIGIN_GENERIC;
import static nodomain.freeyourgadget.gadgetbridge.miband.MiBandConst.ORIGIN_K9MAIL;
import static nodomain.freeyourgadget.gadgetbridge.miband.MiBandConst.ORIGIN_SMS;
import static nodomain.freeyourgadget.gadgetbridge.miband.MiBandConst.VIBRATION_COUNT;
import static nodomain.freeyourgadget.gadgetbridge.miband.MiBandConst.VIBRATION_DURATION;
import static nodomain.freeyourgadget.gadgetbridge.miband.MiBandConst.VIBRATION_PAUSE;
import static nodomain.freeyourgadget.gadgetbridge.miband.MiBandConst.VIBRATION_PROFILE;
import static nodomain.freeyourgadget.gadgetbridge.miband.MiBandConst.getNotificationPrefIntValue;
import static nodomain.freeyourgadget.gadgetbridge.miband.MiBandConst.getNotificationPrefStringValue;
import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.DEFAULT_VALUE_FLASH_COLOUR;
import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.DEFAULT_VALUE_FLASH_COUNT;
import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.DEFAULT_VALUE_FLASH_DURATION;
import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.DEFAULT_VALUE_FLASH_ORIGINAL_COLOUR;
import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.DEFAULT_VALUE_VIBRATION_COUNT;
import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.DEFAULT_VALUE_VIBRATION_DURATION;
import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.DEFAULT_VALUE_VIBRATION_PAUSE;
import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.DEFAULT_VALUE_VIBRATION_PROFILE;
import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.FLASH_COLOUR;
import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.FLASH_COUNT;
import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.FLASH_DURATION;
import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.FLASH_ORIGINAL_COLOUR;
import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.ORIGIN_GENERIC;
import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.ORIGIN_K9MAIL;
import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.ORIGIN_SMS;
import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.VIBRATION_COUNT;
import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.VIBRATION_DURATION;
import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.VIBRATION_PAUSE;
import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.VIBRATION_PROFILE;
import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.getNotificationPrefIntValue;
import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.getNotificationPrefStringValue;
public class MiBandSupport extends AbstractBTLEDeviceSupport {
@ -387,11 +394,11 @@ public class MiBandSupport extends AbstractBTLEDeviceSupport {
}
@Override
public void onSetAlarms(ArrayList<GBAlarm> alarms) {
public void onSetAlarms(ArrayList<Alarm> alarms) {
try {
BluetoothGattCharacteristic characteristic = getCharacteristic(MiBandService.UUID_CHARACTERISTIC_CONTROL_POINT);
TransactionBuilder builder = performInitialized("Set alarm");
for (GBAlarm alarm : alarms) {
for (Alarm alarm : alarms) {
queueAlarm(alarm, builder, characteristic);
}
builder.queue(getQueue());
@ -459,8 +466,8 @@ public class MiBandSupport extends AbstractBTLEDeviceSupport {
}
@Override
public void onSetCallState(String number, String name, GBCommand command) {
if (GBCommand.CALL_INCOMING.equals(command)) {
public void onSetCallState(String number, String name, ServiceCommand command) {
if (ServiceCommand.CALL_INCOMING.equals(command)) {
telephoneRinging = true;
AbortTransactionAction abortAction = new AbortTransactionAction() {
@Override
@ -469,7 +476,7 @@ public class MiBandSupport extends AbstractBTLEDeviceSupport {
}
};
performPreferredNotification("incoming call", MiBandConst.ORIGIN_INCOMING_CALL, abortAction);
} else if (GBCommand.CALL_START.equals(command) || GBCommand.CALL_END.equals(command)) {
} else if (ServiceCommand.CALL_START.equals(command) || ServiceCommand.CALL_END.equals(command)) {
telephoneRinging = false;
}
}
@ -752,7 +759,7 @@ public class MiBandSupport extends AbstractBTLEDeviceSupport {
* @param builder
* @param characteristic
*/
private void queueAlarm(GBAlarm alarm, TransactionBuilder builder, BluetoothGattCharacteristic characteristic) {
private void queueAlarm(Alarm alarm, TransactionBuilder builder, BluetoothGattCharacteristic characteristic) {
Calendar alarmCal = alarm.getAlarmCal();
byte[] alarmMessage = new byte[]{
(byte) MiBandService.COMMAND_SET_TIMER,

4
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/pebble/GadgetbridgePblSupport.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/pebble/GadgetbridgePblSupport.java
View File

@ -1,4 +1,4 @@
package nodomain.freeyourgadget.gadgetbridge.pebble;
package nodomain.freeyourgadget.gadgetbridge.service.pebble;
import android.util.Pair;
@ -17,7 +17,7 @@ import nodomain.freeyourgadget.gadgetbridge.GBException;
import nodomain.freeyourgadget.gadgetbridge.database.DBHandler;
import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEvent;
import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventSendBytes;
import nodomain.freeyourgadget.gadgetbridge.model.SampleProvider;
import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
public class GadgetbridgePblSupport {

5
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/pebble/MorpheuzSupport.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/pebble/MorpheuzSupport.java
View File

@ -1,4 +1,4 @@
package nodomain.freeyourgadget.gadgetbridge.pebble;
package nodomain.freeyourgadget.gadgetbridge.service.pebble;
import android.util.Pair;
@ -17,7 +17,8 @@ import nodomain.freeyourgadget.gadgetbridge.database.DBHandler;
import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEvent;
import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventSendBytes;
import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventSleepMonitorResult;
import nodomain.freeyourgadget.gadgetbridge.model.SampleProvider;
import nodomain.freeyourgadget.gadgetbridge.devices.SampleProvider;
import nodomain.freeyourgadget.gadgetbridge.devices.pebble.MorpheuzSampleProvider;
public class MorpheuzSupport {

12
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/pebble/PebbleIoThread.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/pebble/PebbleIoThread.java
View File

@ -1,4 +1,4 @@
package nodomain.freeyourgadget.gadgetbridge.pebble;
package nodomain.freeyourgadget.gadgetbridge.service.pebble;
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothDevice;
@ -19,14 +19,16 @@ import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.util.zip.ZipInputStream;
import nodomain.freeyourgadget.gadgetbridge.GB;
import nodomain.freeyourgadget.gadgetbridge.GBDevice;
import nodomain.freeyourgadget.gadgetbridge.GBDeviceIoThread;
import nodomain.freeyourgadget.gadgetbridge.util.GB;
import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
import nodomain.freeyourgadget.gadgetbridge.devices.pebble.PBWReader;
import nodomain.freeyourgadget.gadgetbridge.devices.pebble.PebbleInstallable;
import nodomain.freeyourgadget.gadgetbridge.service.GBDeviceIoThread;
import nodomain.freeyourgadget.gadgetbridge.R;
import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEvent;
import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventAppInfo;
import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventAppManagementResult;
import nodomain.freeyourgadget.gadgetbridge.protocol.GBDeviceProtocol;
import nodomain.freeyourgadget.gadgetbridge.service.GBDeviceProtocol;
public class PebbleIoThread extends GBDeviceIoThread {
private static final Logger LOG = LoggerFactory.getLogger(PebbleIoThread.class);

18
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/pebble/PebbleProtocol.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/pebble/PebbleProtocol.java
View File

@ -1,4 +1,4 @@
package nodomain.freeyourgadget.gadgetbridge.pebble;
package nodomain.freeyourgadget.gadgetbridge.service.pebble;
import android.util.Pair;
@ -13,8 +13,8 @@ import java.util.Random;
import java.util.SimpleTimeZone;
import java.util.UUID;
import nodomain.freeyourgadget.gadgetbridge.GBCommand;
import nodomain.freeyourgadget.gadgetbridge.GBDeviceApp;
import nodomain.freeyourgadget.gadgetbridge.model.ServiceCommand;
import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceApp;
import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEvent;
import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventAppInfo;
import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventAppManagementResult;
@ -24,7 +24,7 @@ import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventMusicContr
import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventScreenshot;
import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventSendBytes;
import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventVersionInfo;
import nodomain.freeyourgadget.gadgetbridge.protocol.GBDeviceProtocol;
import nodomain.freeyourgadget.gadgetbridge.service.GBDeviceProtocol;
public class PebbleProtocol extends GBDeviceProtocol {
@ -107,9 +107,9 @@ public class PebbleProtocol extends GBDeviceProtocol {
static final byte PUTBYTES_ABORT = 4;
static final byte PUTBYTES_COMPLETE = 5;
static final byte PUTBYTES_TYPE_FIRMWARE = 1;
static final byte PUTBYTES_TYPE_RECOVERY = 2;
static final byte PUTBYTES_TYPE_SYSRESOURCES = 3;
public static final byte PUTBYTES_TYPE_FIRMWARE = 1;
public static final byte PUTBYTES_TYPE_RECOVERY = 2;
public static final byte PUTBYTES_TYPE_SYSRESOURCES = 3;
public static final byte PUTBYTES_TYPE_RESOURCES = 4;
public static final byte PUTBYTES_TYPE_BINARY = 5;
static final byte PUTBYTES_TYPE_FILE = 6;
@ -287,7 +287,7 @@ public class PebbleProtocol extends GBDeviceProtocol {
@Override
public byte[] encodeFindDevice(boolean start) {
return encodeSetCallState("Where are you?", "Gadgetbridge", start ? GBCommand.CALL_INCOMING : GBCommand.CALL_END);
return encodeSetCallState("Where are you?", "Gadgetbridge", start ? ServiceCommand.CALL_INCOMING : ServiceCommand.CALL_END);
}
private static byte[] encodeExtensibleNotification(int id, int timestamp, String title, String subtitle, String body, byte type) {
@ -450,7 +450,7 @@ public class PebbleProtocol extends GBDeviceProtocol {
}
@Override
public byte[] encodeSetCallState(String number, String name, GBCommand command) {
public byte[] encodeSetCallState(String number, String name, ServiceCommand command) {
String[] parts = {number, name};
byte pebbleCmd;
switch (command) {

12
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/pebble/PebbleSupport.java → app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/pebble/PebbleSupport.java
View File

@ -1,13 +1,13 @@
package nodomain.freeyourgadget.gadgetbridge.pebble;
package nodomain.freeyourgadget.gadgetbridge.service.pebble;
import android.net.Uri;
import java.util.ArrayList;
import nodomain.freeyourgadget.gadgetbridge.AbstractBTDeviceSupport;
import nodomain.freeyourgadget.gadgetbridge.GBAlarm;
import nodomain.freeyourgadget.gadgetbridge.GBDeviceIoThread;
import nodomain.freeyourgadget.gadgetbridge.protocol.GBDeviceProtocol;
import nodomain.freeyourgadget.gadgetbridge.model.Alarm;
import nodomain.freeyourgadget.gadgetbridge.service.AbstractBTDeviceSupport;
import nodomain.freeyourgadget.gadgetbridge.service.GBDeviceIoThread;
import nodomain.freeyourgadget.gadgetbridge.service.GBDeviceProtocol;
public class PebbleSupport extends AbstractBTDeviceSupport {
@ -43,7 +43,7 @@ public class PebbleSupport extends AbstractBTDeviceSupport {
}
@Override
public void onSetAlarms(ArrayList<GBAlarm> alarms) {
public void onSetAlarms(ArrayList<Alarm> alarms) {
//nothing to do ATM
}
}

Some files were not shown because too many files have changed in this diff Show More