Skip to content

Feature/quint/appinfo via converter #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Feature/quint/appinfo via converter #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
91ccbd6
Split ApplicationData in two sections, static information supplied by…
quintstoffers Aug 4, 2014
09ac2fe
Move ETL to .sync package
quintstoffers Aug 4, 2014
2ed0ea2
Added getAppInfo method to Converter interface
quintstoffers Aug 4, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/src/main/java/com/quantimodo/sync/Global.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import android.content.Context;
import android.content.SharedPreferences;
import android.preference.PreferenceManager;
import com.quantimodo.sync.model.ApplicationData;
import com.quantimodo.sync.model.SyncableApp;
import com.quantimodo.sync.model.SensorData;

import java.util.ArrayList;
Expand All @@ -16,7 +16,7 @@ public class Global
public static final String QM_SECRET = "joeyrpmslrf8w4wef6weq9qytpu50374bosgr8";
public static final String historyPackage = "syncs.sqlite";

public static List<ApplicationData> applications = new ArrayList<ApplicationData>();
public static List<SyncableApp> applications = new ArrayList<SyncableApp>();
public static List<SensorData> sensors = new ArrayList<SensorData>();

// FLags
Expand Down
14 changes: 7 additions & 7 deletions app/src/main/java/com/quantimodo/sync/HistoryActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import android.widget.TextView;
import com.quantimodo.sync.databases.QuantiSyncContentProvider;
import com.quantimodo.sync.databases.QuantiSyncDbHelper;
import com.quantimodo.sync.model.ApplicationData;
import com.quantimodo.sync.model.SyncableApp;
import com.quantimodo.sync.model.HistoryGroup;
import com.quantimodo.sync.model.HistoryItem;

Expand Down Expand Up @@ -189,10 +189,10 @@ public View getView(int position, View convertView, ViewGroup parent) {

HistoryItem entry = historyItems.get(position);

ApplicationData application = null;
for( ApplicationData temp : Global.applications)
SyncableApp application = null;
for( SyncableApp temp : Global.applications)
{
if(temp.label != null && temp.label.equals(entry.packageLabel))
if(temp.appInfo.label != null && temp.appInfo.label.equals(entry.packageLabel))
{
application = temp;
break;
Expand All @@ -206,7 +206,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
}
else
{
holder.tvAppLabel.setText(application.label);
holder.tvAppLabel.setText(application.appInfo.label);
if(application.icon == null)
{
holder.imAppIcon.setImageResource(R.drawable.ic_appiconplaceholder);
Expand All @@ -220,12 +220,12 @@ public View getView(int position, View convertView, ViewGroup parent) {
if(entry.syncError == null)
{
holder.tvSyncDescription.setText(String.format("%d measurements were synced", entry.syncCount));
holder.vwIndicator.setBackgroundResource(R.color.indicator_success);
holder.vwIndicator.setBackgroundColor(getResources().getColor(R.color.indicator_success));
}
else
{
holder.tvSyncDescription.setText(entry.syncError);
holder.vwIndicator.setBackgroundResource(R.color.indicator_faillure);
holder.vwIndicator.setBackgroundColor(getResources().getColor(R.color.indicator_faillure));
}

holder.tvSyncDate.setText(dateFormat.format(entry.timestamp) + ", " + timeFormat.format(entry.timestamp));
Expand Down
4 changes: 2 additions & 2 deletions ...com/quantimodo/etl/ArrayDatabaseView.java → ...uantimodo/sync/etl/ArrayDatabaseView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.quantimodo.etl;
package com.quantimodo.sync.etl;

import com.quantimodo.etl.utils.DatabaseViewUtil;
import com.quantimodo.sync.etl.utils.DatabaseViewUtil;

public class ArrayDatabaseView implements DatabaseView
{
Expand Down
4 changes: 2 additions & 2 deletions ...n/java/com/quantimodo/etl/ArrayTable.java → ...a/com/quantimodo/sync/etl/ArrayTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.quantimodo.etl;
package com.quantimodo.sync.etl;

import com.quantimodo.etl.utils.TableUtil;
import com.quantimodo.sync.etl.utils.TableUtil;

import java.util.List;

Expand Down
2 changes: 1 addition & 1 deletion ...java/com/quantimodo/etl/DatabaseView.java → ...com/quantimodo/sync/etl/DatabaseView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.quantimodo.etl;
package com.quantimodo.sync.etl;

public interface DatabaseView
{
Expand Down
40 changes: 20 additions & 20 deletions ...src/main/java/com/quantimodo/etl/ETL.java → ...ain/java/com/quantimodo/sync/etl/ETL.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
package com.quantimodo.etl;
package com.quantimodo.sync.etl;

import com.quantimodo.android.sdk.model.MeasurementSet;
import com.quantimodo.etl.converters.AccupedoConverter;
import com.quantimodo.etl.converters.CallRecorderConverter;
import com.quantimodo.etl.converters.CardiographConverter;
import com.quantimodo.etl.converters.Converter;
import com.quantimodo.etl.converters.DataHabitConverter;
import com.quantimodo.etl.converters.GoodDayJournalConverter;
import com.quantimodo.etl.converters.HowAreYouFeelingConverter;
import com.quantimodo.etl.converters.MedHelperConverter;
import com.quantimodo.etl.converters.MediSafeConverter;
import com.quantimodo.etl.converters.MyFitnessPalConverter;
import com.quantimodo.etl.converters.SleepAsAndroidConverter;
import com.quantimodo.etl.converters.SportsTrackerConverter;
import com.quantimodo.etl.converters.T2MoodTrackerConverter;
import com.quantimodo.etl.converters.ZombiesRunConverter;
import com.quantimodo.etl.converters.myFitnessCompanionConverter;
import com.quantimodo.etl.readers.CSVReader;
import com.quantimodo.etl.readers.Reader;
import com.quantimodo.etl.readers.SQLiteReader;
import com.quantimodo.etl.readers.SpreadsheetReader;
import com.quantimodo.sync.etl.converters.AccupedoConverter;
import com.quantimodo.sync.etl.converters.CallRecorderConverter;
import com.quantimodo.sync.etl.converters.CardiographConverter;
import com.quantimodo.sync.etl.converters.Converter;
import com.quantimodo.sync.etl.converters.DataHabitConverter;
import com.quantimodo.sync.etl.converters.GoodDayJournalConverter;
import com.quantimodo.sync.etl.converters.HowAreYouFeelingConverter;
import com.quantimodo.sync.etl.converters.MedHelperConverter;
import com.quantimodo.sync.etl.converters.MediSafeConverter;
import com.quantimodo.sync.etl.converters.MyFitnessPalConverter;
import com.quantimodo.sync.etl.converters.SleepAsAndroidConverter;
import com.quantimodo.sync.etl.converters.SportsTrackerConverter;
import com.quantimodo.sync.etl.converters.T2MoodTrackerConverter;
import com.quantimodo.sync.etl.converters.ZombiesRunConverter;
import com.quantimodo.sync.etl.converters.myFitnessCompanionConverter;
import com.quantimodo.sync.etl.readers.CSVReader;
import com.quantimodo.sync.etl.readers.Reader;
import com.quantimodo.sync.etl.readers.SQLiteReader;
import com.quantimodo.sync.etl.readers.SpreadsheetReader;

import java.io.File;
import java.io.IOException;
Expand Down
2 changes: 1 addition & 1 deletion ...c/main/java/com/quantimodo/etl/Table.java → ...n/java/com/quantimodo/sync/etl/Table.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.quantimodo.etl;
package com.quantimodo.sync.etl;

public interface Table
{
Expand Down
6 changes: 3 additions & 3 deletions ...odo/etl/converters/AccupedoConverter.java → ...ync/etl/converters/AccupedoConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.quantimodo.etl.converters;
package com.quantimodo.sync.etl.converters;

import com.quantimodo.android.sdk.model.Measurement;
import com.quantimodo.android.sdk.model.MeasurementSet;
import com.quantimodo.etl.DatabaseView;
import com.quantimodo.etl.Table;
import com.quantimodo.sync.etl.DatabaseView;
import com.quantimodo.sync.etl.Table;

import java.util.ArrayList;
import java.util.GregorianCalendar;
Expand Down
6 changes: 3 additions & 3 deletions ...etl/converters/CallRecorderConverter.java → ...etl/converters/CallRecorderConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.quantimodo.etl.converters;
package com.quantimodo.sync.etl.converters;

import com.quantimodo.android.sdk.model.Measurement;
import com.quantimodo.android.sdk.model.MeasurementSet;
import com.quantimodo.etl.DatabaseView;
import com.quantimodo.etl.Table;
import com.quantimodo.sync.etl.DatabaseView;
import com.quantimodo.sync.etl.Table;

import java.util.ArrayList;
import java.util.HashMap;
Expand Down
6 changes: 3 additions & 3 deletions .../etl/converters/CardiographConverter.java → .../etl/converters/CardiographConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.quantimodo.etl.converters;
package com.quantimodo.sync.etl.converters;

import com.quantimodo.android.sdk.model.Measurement;
import com.quantimodo.android.sdk.model.MeasurementSet;
import com.quantimodo.etl.DatabaseView;
import com.quantimodo.etl.Table;
import com.quantimodo.sync.etl.DatabaseView;
import com.quantimodo.sync.etl.Table;

import java.util.ArrayList;

Expand Down
7 changes: 5 additions & 2 deletions .../quantimodo/etl/converters/Converter.java → ...timodo/sync/etl/converters/Converter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
package com.quantimodo.etl.converters;
package com.quantimodo.sync.etl.converters;

import com.quantimodo.android.sdk.model.MeasurementSet;
import com.quantimodo.etl.DatabaseView;
import com.quantimodo.sync.etl.DatabaseView;
import com.quantimodo.sync.model.SyncableAppInfo;

import java.util.ArrayList;

public interface Converter
{
ArrayList<MeasurementSet> convert(DatabaseView databaseView);

SyncableAppInfo getAppInfo();
}

6 changes: 3 additions & 3 deletions ...do/etl/converters/DataHabitConverter.java → ...nc/etl/converters/DataHabitConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.quantimodo.etl.converters;
package com.quantimodo.sync.etl.converters;

import com.quantimodo.android.sdk.model.Measurement;
import com.quantimodo.android.sdk.model.MeasurementSet;
import com.quantimodo.etl.DatabaseView;
import com.quantimodo.etl.Table;
import com.quantimodo.sync.etl.DatabaseView;
import com.quantimodo.sync.etl.Table;

import java.util.ArrayList;
import java.util.HashMap;
Expand Down
6 changes: 3 additions & 3 deletions ...l/converters/GoodDayJournalConverter.java → ...l/converters/GoodDayJournalConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.quantimodo.etl.converters;
package com.quantimodo.sync.etl.converters;

import com.quantimodo.android.sdk.model.Measurement;
import com.quantimodo.android.sdk.model.MeasurementSet;
import com.quantimodo.etl.DatabaseView;
import com.quantimodo.etl.Table;
import com.quantimodo.sync.etl.DatabaseView;
import com.quantimodo.sync.etl.Table;

import java.util.ArrayList;
import java.util.GregorianCalendar;
Expand Down
6 changes: 3 additions & 3 deletions ...converters/HowAreYouFeelingConverter.java → ...converters/HowAreYouFeelingConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.quantimodo.etl.converters;
package com.quantimodo.sync.etl.converters;

import com.quantimodo.android.sdk.model.Measurement;
import com.quantimodo.android.sdk.model.MeasurementSet;
import com.quantimodo.etl.DatabaseView;
import com.quantimodo.etl.Table;
import com.quantimodo.sync.etl.DatabaseView;
import com.quantimodo.sync.etl.Table;

import java.util.ArrayList;
import java.util.HashMap;
Expand Down
6 changes: 3 additions & 3 deletions ...do/etl/converters/MedHelperConverter.java → ...nc/etl/converters/MedHelperConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.quantimodo.etl.converters;
package com.quantimodo.sync.etl.converters;

import com.quantimodo.android.sdk.model.Measurement;
import com.quantimodo.android.sdk.model.MeasurementSet;
import com.quantimodo.etl.DatabaseView;
import com.quantimodo.etl.Table;
import com.quantimodo.sync.etl.DatabaseView;
import com.quantimodo.sync.etl.Table;

import java.util.ArrayList;
import java.util.HashMap;
Expand Down
8 changes: 4 additions & 4 deletions ...odo/etl/converters/MediSafeConverter.java → ...ync/etl/converters/MediSafeConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.quantimodo.etl.converters;
package com.quantimodo.sync.etl.converters;

import com.quantimodo.android.sdk.model.Measurement;
import com.quantimodo.android.sdk.model.MeasurementSet;
import com.quantimodo.etl.DatabaseView;
import com.quantimodo.etl.utils.ParseUtil;
import com.quantimodo.etl.Table;
import com.quantimodo.sync.etl.DatabaseView;
import com.quantimodo.sync.etl.utils.ParseUtil;
import com.quantimodo.sync.etl.Table;

import java.util.ArrayList;
import java.util.HashMap;
Expand Down
6 changes: 3 additions & 3 deletions ...etl/converters/MyFitnessPalConverter.java → ...etl/converters/MyFitnessPalConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.quantimodo.etl.converters;
package com.quantimodo.sync.etl.converters;

import com.quantimodo.android.sdk.model.Measurement;
import com.quantimodo.android.sdk.model.MeasurementSet;
import com.quantimodo.etl.DatabaseView;
import com.quantimodo.etl.Table;
import com.quantimodo.sync.etl.DatabaseView;
import com.quantimodo.sync.etl.Table;

import java.util.ArrayList;
import java.util.Calendar;
Expand Down
6 changes: 3 additions & 3 deletions ...l/converters/SleepAsAndroidConverter.java → ...l/converters/SleepAsAndroidConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.quantimodo.etl.converters;
package com.quantimodo.sync.etl.converters;

import com.quantimodo.android.sdk.model.Measurement;
import com.quantimodo.android.sdk.model.MeasurementSet;
import com.quantimodo.etl.DatabaseView;
import com.quantimodo.etl.Table;
import com.quantimodo.sync.etl.DatabaseView;
import com.quantimodo.sync.etl.Table;

import java.util.ArrayList;

Expand Down
6 changes: 3 additions & 3 deletions ...tl/converters/SportsTrackerConverter.java → ...tl/converters/SportsTrackerConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.quantimodo.etl.converters;
package com.quantimodo.sync.etl.converters;

import com.quantimodo.android.sdk.model.Measurement;
import com.quantimodo.android.sdk.model.MeasurementSet;
import com.quantimodo.etl.DatabaseView;
import com.quantimodo.etl.Table;
import com.quantimodo.sync.etl.DatabaseView;
import com.quantimodo.sync.etl.Table;

import java.util.ArrayList;

Expand Down
6 changes: 3 additions & 3 deletions ...tl/converters/T2MoodTrackerConverter.java → ...tl/converters/T2MoodTrackerConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.quantimodo.etl.converters;
package com.quantimodo.sync.etl.converters;

import com.quantimodo.android.sdk.model.Measurement;
import com.quantimodo.android.sdk.model.MeasurementSet;
import com.quantimodo.etl.DatabaseView;
import com.quantimodo.etl.Table;
import com.quantimodo.sync.etl.DatabaseView;
import com.quantimodo.sync.etl.Table;

import java.util.ArrayList;
import java.util.HashMap;
Expand Down
8 changes: 4 additions & 4 deletions ...o/etl/converters/ZombiesRunConverter.java → ...c/etl/converters/ZombiesRunConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.quantimodo.etl.converters;
package com.quantimodo.sync.etl.converters;

import com.quantimodo.android.sdk.model.Measurement;
import com.quantimodo.android.sdk.model.MeasurementSet;
import com.quantimodo.etl.DatabaseView;
import com.quantimodo.etl.utils.ParseUtil;
import com.quantimodo.etl.Table;
import com.quantimodo.sync.etl.DatabaseView;
import com.quantimodo.sync.etl.utils.ParseUtil;
import com.quantimodo.sync.etl.Table;

import java.util.ArrayList;

Expand Down
6 changes: 3 additions & 3 deletions ...nverters/myFitnessCompanionConverter.java → ...nverters/myFitnessCompanionConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.quantimodo.etl.converters;
package com.quantimodo.sync.etl.converters;

import com.quantimodo.android.sdk.model.Measurement;
import com.quantimodo.android.sdk.model.MeasurementSet;
import com.quantimodo.etl.DatabaseView;
import com.quantimodo.etl.Table;
import com.quantimodo.sync.etl.DatabaseView;
import com.quantimodo.sync.etl.Table;

import java.util.ArrayList;
import java.util.GregorianCalendar;
Expand Down
8 changes: 4 additions & 4 deletions ...com/quantimodo/etl/readers/CSVReader.java → ...uantimodo/sync/etl/readers/CSVReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.quantimodo.etl.readers;
package com.quantimodo.sync.etl.readers;

import com.quantimodo.etl.ArrayDatabaseView;
import com.quantimodo.etl.ArrayTable;
import com.quantimodo.etl.DatabaseView;
import com.quantimodo.sync.etl.ArrayDatabaseView;
import com.quantimodo.sync.etl.ArrayTable;
import com.quantimodo.sync.etl.DatabaseView;

import java.io.File;
import java.io.FileReader;
Expand Down
4 changes: 2 additions & 2 deletions ...va/com/quantimodo/etl/readers/Reader.java → ...m/quantimodo/sync/etl/readers/Reader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.quantimodo.etl.readers;
package com.quantimodo.sync.etl.readers;

import com.quantimodo.etl.DatabaseView;
import com.quantimodo.sync.etl.DatabaseView;

import java.io.File;
import java.io.IOException;
Expand Down
8 changes: 4 additions & 4 deletions .../quantimodo/etl/readers/SQLiteReader.java → ...timodo/sync/etl/readers/SQLiteReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package com.quantimodo.etl.readers;
package com.quantimodo.sync.etl.readers;

import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteException;

import com.quantimodo.etl.ArrayDatabaseView;
import com.quantimodo.etl.ArrayTable;
import com.quantimodo.etl.DatabaseView;
import com.quantimodo.sync.etl.ArrayDatabaseView;
import com.quantimodo.sync.etl.ArrayTable;
import com.quantimodo.sync.etl.DatabaseView;

import java.io.File;
import java.io.IOException;
Expand Down
8 changes: 4 additions & 4 deletions ...timodo/etl/readers/SpreadsheetReader.java → ...o/sync/etl/readers/SpreadsheetReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.quantimodo.etl.readers;
package com.quantimodo.sync.etl.readers;

import com.quantimodo.etl.ArrayDatabaseView;
import com.quantimodo.etl.ArrayTable;
import com.quantimodo.etl.DatabaseView;
import com.quantimodo.sync.etl.ArrayDatabaseView;
import com.quantimodo.sync.etl.ArrayTable;
import com.quantimodo.sync.etl.DatabaseView;

import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.ss.formula.eval.NotImplementedException;
Expand Down
Loading