From 91ccbd69b55ba88f424ae432d29e7de57cffab63 Mon Sep 17 00:00:00 2001 From: Quint Stoffers Date: Mon, 4 Aug 2014 15:50:33 +0200 Subject: [PATCH 1/3] Split ApplicationData in two sections, static information supplied by converters and dynamic data like the icon --- .../main/java/com/quantimodo/sync/Global.java | 4 +- .../com/quantimodo/sync/HistoryActivity.java | 14 ++--- .../fragments/ApplicationListFragment.java | 36 ++++++------ ...{ApplicationData.java => SyncableApp.java} | 44 +++++---------- .../sync/model/SyncableAppInfo.java | 53 ++++++++++++++++++ .../receivers/PackagesChangedReceiver.java | 15 +++-- .../sync/sync/AppDataSyncAdapter.java | 56 +++++++++---------- 7 files changed, 128 insertions(+), 94 deletions(-) rename app/src/main/java/com/quantimodo/sync/model/{ApplicationData.java => SyncableApp.java} (82%) create mode 100644 app/src/main/java/com/quantimodo/sync/model/SyncableAppInfo.java diff --git a/app/src/main/java/com/quantimodo/sync/Global.java b/app/src/main/java/com/quantimodo/sync/Global.java index 05b9ab0..bfa8074 100644 --- a/app/src/main/java/com/quantimodo/sync/Global.java +++ b/app/src/main/java/com/quantimodo/sync/Global.java @@ -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; @@ -16,7 +16,7 @@ public class Global public static final String QM_SECRET = "joeyrpmslrf8w4wef6weq9qytpu50374bosgr8"; public static final String historyPackage = "syncs.sqlite"; - public static List applications = new ArrayList(); + public static List applications = new ArrayList(); public static List sensors = new ArrayList(); // FLags diff --git a/app/src/main/java/com/quantimodo/sync/HistoryActivity.java b/app/src/main/java/com/quantimodo/sync/HistoryActivity.java index 5e2cef0..4258bf2 100644 --- a/app/src/main/java/com/quantimodo/sync/HistoryActivity.java +++ b/app/src/main/java/com/quantimodo/sync/HistoryActivity.java @@ -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; @@ -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; @@ -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); @@ -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)); diff --git a/app/src/main/java/com/quantimodo/sync/fragments/ApplicationListFragment.java b/app/src/main/java/com/quantimodo/sync/fragments/ApplicationListFragment.java index cf74322..a50e5f3 100644 --- a/app/src/main/java/com/quantimodo/sync/fragments/ApplicationListFragment.java +++ b/app/src/main/java/com/quantimodo/sync/fragments/ApplicationListFragment.java @@ -15,7 +15,7 @@ import com.quantimodo.android.sdk.Quantimodo; import com.quantimodo.sync.Global; import com.quantimodo.sync.R; -import com.quantimodo.sync.model.ApplicationData; +import com.quantimodo.sync.model.SyncableApp; import se.emilsjolander.stickylistheaders.StickyListHeadersAdapter; import se.emilsjolander.stickylistheaders.StickyListHeadersListView; @@ -43,14 +43,12 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa return null; } - ApplicationData.getCompatibleApplications(activity.getApplicationContext(), new Handler(), new ApplicationData.OnCompatibleApplicationsLoaded() - { - @Override - public void onComplete() - { - ApplicationListFragment.update(); - } - }); + SyncableApp.getCompatibleApplications(activity.getApplicationContext(), new Handler(), new SyncableApp.OnCompatibleApplicationsLoaded() { + @Override + public void onComplete() { + ApplicationListFragment.update(); + } + }); View view = inflater.inflate(R.layout.fragment_applicationlist, container, false); @@ -115,7 +113,7 @@ public static void update() { int position = (Integer) view.getTag(); - ApplicationData currentApp = Global.applications.get(position); + SyncableApp currentApp = Global.applications.get(position); if (currentApp.isInstalled) { boolean nowSyncing = currentApp.setSyncEnabled(activity, !currentApp.isSyncEnabled()); @@ -140,7 +138,7 @@ public static void update() else { // Start a generic ACTION_VIEW intent, most likely captured by the Play store, there's no way of knowing whether the user installed the app here or not. - activity.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=" + currentApp.packageName))); + activity.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=" + currentApp.appInfo.packageName))); } } }; @@ -155,21 +153,21 @@ public static void update() { int position = (Integer) view.getTag(); - ApplicationData currentApp = Global.applications.get(position); + SyncableApp currentApp = Global.applications.get(position); PackageManager packageManager = activity.getPackageManager(); try { - Intent launchIntent = packageManager.getLaunchIntentForPackage(currentApp.packageName); + Intent launchIntent = packageManager.getLaunchIntentForPackage(currentApp.appInfo.packageName); activity.startActivity(launchIntent); } catch (Exception e) { - activity.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=" + currentApp.packageName))); + activity.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=" + currentApp.appInfo.packageName))); } } }; - public class Adapter extends ArrayAdapter implements StickyListHeadersAdapter + public class Adapter extends ArrayAdapter implements StickyListHeadersAdapter { private LayoutInflater inflater; @@ -199,7 +197,7 @@ public int getCount() } @Override - public ApplicationData getItem(int position) + public SyncableApp getItem(int position) { return Global.applications.get(position); } @@ -220,7 +218,7 @@ public long getHeaderId(int i) public View getView(int position, View convertView, ViewGroup parent) { ViewHolder holder; - ApplicationData application = Global.applications.get(position); + SyncableApp application = Global.applications.get(position); if (convertView == null) { holder = new ViewHolder(); @@ -243,7 +241,7 @@ public View getView(int position, View convertView, ViewGroup parent) holder.stateIcon.setTag(position); // This tag is used to identify the row when it was clicked holder.appIcon.setTag(position); // Idem - holder.label.setText(application.label); + holder.label.setText(application.appInfo.label); if (application.icon != null) { holder.appIcon.setImageDrawable(application.icon); @@ -284,7 +282,7 @@ public View getView(int position, View convertView, ViewGroup parent) public View getHeaderView(int position, View convertView, ViewGroup viewGroup) { HeaderViewHolder holder; - ApplicationData application = Global.applications.get(position); + SyncableApp application = Global.applications.get(position); if (convertView == null) { holder = new HeaderViewHolder(); diff --git a/app/src/main/java/com/quantimodo/sync/model/ApplicationData.java b/app/src/main/java/com/quantimodo/sync/model/SyncableApp.java similarity index 82% rename from app/src/main/java/com/quantimodo/sync/model/ApplicationData.java rename to app/src/main/java/com/quantimodo/sync/model/SyncableApp.java index 8c83763..1971d94 100644 --- a/app/src/main/java/com/quantimodo/sync/model/ApplicationData.java +++ b/app/src/main/java/com/quantimodo/sync/model/SyncableApp.java @@ -5,7 +5,6 @@ import android.content.Context; import android.content.SharedPreferences; import android.content.pm.PackageManager; -import android.content.res.AssetManager; import android.graphics.drawable.Drawable; import android.os.Environment; import android.os.Handler; @@ -28,26 +27,19 @@ import java.util.Collections; import java.util.List; -public class ApplicationData implements Comparable +public class SyncableApp implements Comparable { - public String syncStatus; + // Static application data, supplied by converters + public SyncableAppInfo appInfo; - public String label; // Label the user sees in his app drawer - public String packageName; // Package name to identify individual apps - public File dataFile; // Location of this app's useful data - public boolean rootRequired; // True if root is required to export data public boolean isInstalled; - public List dataTypes = new ArrayList(); // Types of data this app can provide + private boolean isSyncEnabled; + public String syncStatus; public Drawable icon; - private boolean isSyncEnabled; - - public ApplicationData(String label, String packageName, File dataFile, boolean rootRequired, boolean isInstalled, boolean isSyncEnabled) + public SyncableApp(SyncableAppInfo appInfo, boolean isInstalled, boolean isSyncEnabled) { - this.label = label; - this.packageName = packageName; - this.dataFile = dataFile; - this.rootRequired = rootRequired; + this.appInfo = appInfo; this.isInstalled = isInstalled; this.isSyncEnabled = isSyncEnabled; } @@ -64,7 +56,7 @@ public boolean setSyncEnabled(Context context, boolean isSyncEnabled) SharedPreferences prefs = context.getSharedPreferences("com.quantimodo.sync_preferences", Context.MODE_MULTI_PROCESS); String currentSyncingPackages = prefs.getString("syncingPackages", ""); - String thisSyncingApp = this.packageName + ","; + String thisSyncingApp = this.appInfo.packageName + ","; Log.i("Before syncing: " + currentSyncingPackages + ":"); if (isSyncEnabled) { @@ -136,7 +128,7 @@ public static void getCompatibleApplications(final Context context, final Handle final SharedPreferences prefs = context.getSharedPreferences("com.quantimodo.sync_preferences", Context.MODE_MULTI_PROCESS); final String currentSyncingPackages = prefs.getString("syncingPackages", ""); - final List tempApps = new ArrayList(); + final List tempApps = new ArrayList(); final PackageManager packageManager = context.getPackageManager(); try @@ -153,7 +145,7 @@ public static void getCompatibleApplications(final Context context, final Handle xmlIn.setContentHandler(new DefaultHandler() // Set handler to parse the data { - private ApplicationData currentApp; + private SyncableApp currentApp; private String newSyncingPackages; @@ -230,16 +222,10 @@ else if (dataPath.startsWith("/external")) String thisSyncingApp = packageName + ","; boolean isSyncEnabled = currentSyncingPackages.contains(thisSyncingApp); - currentApp = new ApplicationData(label, packageName, dataFile, rootRequired, isInstalled, isSyncEnabled); // Set currentApp to this app + SyncableAppInfo appInfo = new SyncableAppInfo(label, packageName, dataFile, rootRequired); + currentApp = new SyncableApp(appInfo, isInstalled, isSyncEnabled); // Set currentApp to this app currentApp.icon = icon; } - else if (qName.equals("DataTypes")) // This element contains datatypes for currentApp - { - for (int i = 0; i < atts.getLength(); i++) // Loop through all types and store the name - { - currentApp.dataTypes.add(atts.getValue(i)); - } - } } public void endElement(String uri, String name, String qName) @@ -272,15 +258,15 @@ public void endElement(String uri, String name, String qName) } @Override - public int compareTo(ApplicationData otherApp) + public int compareTo(SyncableApp otherApp) { if (this.isInstalled && otherApp.isInstalled) // Both installed { - return label.compareToIgnoreCase(otherApp.label); + return appInfo.label.compareToIgnoreCase(otherApp.appInfo.label); } else if (!this.isInstalled && !otherApp.isInstalled) // Neither installed { - return label.compareToIgnoreCase(otherApp.label); + return appInfo.label.compareToIgnoreCase(otherApp.appInfo.label); } else // One installed { diff --git a/app/src/main/java/com/quantimodo/sync/model/SyncableAppInfo.java b/app/src/main/java/com/quantimodo/sync/model/SyncableAppInfo.java new file mode 100644 index 0000000..c0c65f0 --- /dev/null +++ b/app/src/main/java/com/quantimodo/sync/model/SyncableAppInfo.java @@ -0,0 +1,53 @@ +package com.quantimodo.sync.model; + +import android.accounts.Account; +import android.content.ContentResolver; +import android.content.Context; +import android.content.SharedPreferences; +import android.content.pm.PackageManager; +import android.graphics.drawable.Drawable; +import android.os.Environment; +import android.os.Handler; + +import com.quantimodo.android.sdk.Quantimodo; +import com.quantimodo.sync.Global; +import com.quantimodo.sync.Log; +import com.quantimodo.sync.R; + +import org.xml.sax.Attributes; +import org.xml.sax.InputSource; +import org.xml.sax.SAXException; +import org.xml.sax.XMLReader; +import org.xml.sax.helpers.DefaultHandler; + +import java.io.BufferedReader; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.parsers.SAXParser; +import javax.xml.parsers.SAXParserFactory; + +/** + * Holds static application data supplied by converters. + */ +public class SyncableAppInfo +{ + public String label; // Label the user sees in his app drawer + public String packageName; // Package name to identify individual apps + public File dataFile; // Location of this app's useful data + public boolean rootRequired; // True if root is required to export data + + public SyncableAppInfo(String label, String packageName, File dataFile, boolean rootRequired) + { + this.label = label; + this.packageName = packageName; + this.dataFile = dataFile; + this.rootRequired = rootRequired; + } +} diff --git a/app/src/main/java/com/quantimodo/sync/receivers/PackagesChangedReceiver.java b/app/src/main/java/com/quantimodo/sync/receivers/PackagesChangedReceiver.java index 67aaa7a..b2e7a8f 100644 --- a/app/src/main/java/com/quantimodo/sync/receivers/PackagesChangedReceiver.java +++ b/app/src/main/java/com/quantimodo/sync/receivers/PackagesChangedReceiver.java @@ -6,7 +6,7 @@ import com.quantimodo.android.sdk.Quantimodo; import com.quantimodo.sync.Global; import com.quantimodo.sync.fragments.ApplicationListFragment; -import com.quantimodo.sync.model.ApplicationData; +import com.quantimodo.sync.model.SyncableApp; /* * BroadcastReceiver to monitor installed/uninstalled packages to refresh @@ -21,13 +21,12 @@ public class PackagesChangedReceiver extends BroadcastReceiver { if (Global.applications.size() != 0) // Only request a reload if there were apps loaded to begin with { - ApplicationData.getCompatibleApplications(context, new Handler(), new ApplicationData.OnCompatibleApplicationsLoaded() - { - @Override public void onComplete() - { - ApplicationListFragment.update(); - } - }); + SyncableApp.getCompatibleApplications(context, new Handler(), new SyncableApp.OnCompatibleApplicationsLoaded() { + @Override + public void onComplete() { + ApplicationListFragment.update(); + } + }); } else // The app isn't in the foreground, so check if there was an uninstall and potentially remove if from the "syncing" list { diff --git a/app/src/main/java/com/quantimodo/sync/sync/AppDataSyncAdapter.java b/app/src/main/java/com/quantimodo/sync/sync/AppDataSyncAdapter.java index b310a92..bd12fd3 100644 --- a/app/src/main/java/com/quantimodo/sync/sync/AppDataSyncAdapter.java +++ b/app/src/main/java/com/quantimodo/sync/sync/AppDataSyncAdapter.java @@ -13,7 +13,7 @@ import com.quantimodo.sync.Global; import com.quantimodo.sync.Log; import com.quantimodo.sync.databases.QuantiSyncDbHelper; -import com.quantimodo.sync.model.ApplicationData; +import com.quantimodo.sync.model.SyncableApp; import com.quantimodo.sync.model.HistoryItem; import com.quantimodo.sync.su.SU; @@ -31,7 +31,7 @@ public class AppDataSyncAdapter extends AbstractThreadedSyncAdapter private String authToken; - private ArrayList syncingApps; + private ArrayList syncingApps; public AppDataSyncAdapter(Context context, boolean autoInitialize) { @@ -69,14 +69,12 @@ private void getSyncingApps() { gotApps = false; - ApplicationData.getCompatibleApplications(context, handler, new ApplicationData.OnCompatibleApplicationsLoaded() - { - @Override - public void onComplete() - { - gotApps = true; - } - }); + SyncableApp.getCompatibleApplications(context, handler, new SyncableApp.OnCompatibleApplicationsLoaded() { + @Override + public void onComplete() { + gotApps = true; + } + }); while (!gotApps) { @@ -89,8 +87,8 @@ public void onComplete() } } - syncingApps = new ArrayList(); - for (ApplicationData currentData : Global.applications) + syncingApps = new ArrayList(); + for (SyncableApp currentData : Global.applications) { if (currentData.isInstalled && currentData.isSyncEnabled() && !syncingApps.contains(currentData)) { @@ -99,7 +97,7 @@ public void onComplete() } } - private void sync(ArrayList syncingApps) + private void sync(ArrayList syncingApps) { ArrayList allNewData = new ArrayList(); @@ -114,47 +112,47 @@ private void sync(ArrayList syncingApps) String cachePath = context.getCacheDir().getPath(); Log.i("Cache root path at: " + cachePath); - for (ApplicationData currentApp : syncingApps) + for (SyncableApp currentApp : syncingApps) { - Log.i(currentApp.packageName + ": Started sync"); + Log.i(currentApp.appInfo.packageName + ": Started sync"); File cacheFile = null; try { - String filepath = cachePath + "/" + currentApp.packageName + "-" + currentApp.dataFile.getName(); + String filepath = cachePath + "/" + currentApp.appInfo.packageName + "-" + currentApp.appInfo.dataFile.getName(); cacheFile = new File(filepath); ArrayList oldData = null; ArrayList newData; if (cacheFile.exists()) { - Log.i(currentApp.packageName + ": Extracting old data"); + Log.i(currentApp.appInfo.packageName + ": Extracting old data"); oldData = etl.handle(cacheFile); - Log.i(currentApp.packageName + " Read " + oldData.size() + " old measurement sets"); + Log.i(currentApp.appInfo.packageName + " Read " + oldData.size() + " old measurement sets"); } else { - Log.i(currentApp.packageName + ": No previous sync"); + Log.i(currentApp.appInfo.packageName + ": No previous sync"); } - Log.i(currentApp.packageName + ": Caching new data"); - SU.copyToCache(outputS, inputS, currentApp.dataFile.getPath(), cacheFile.getPath()); + Log.i(currentApp.appInfo.packageName + ": Caching new data"); + SU.copyToCache(outputS, inputS, currentApp.appInfo.dataFile.getPath(), cacheFile.getPath()); if (cacheFile.exists()) { - Log.i(currentApp.packageName + ": Extracting new data"); + Log.i(currentApp.appInfo.packageName + ": Extracting new data"); newData = etl.handle(cacheFile); - Log.i(currentApp.packageName + " Read " + newData.size() + " new measurement sets"); + Log.i(currentApp.appInfo.packageName + " Read " + newData.size() + " new measurement sets"); } else { - Log.i(currentApp.packageName + ": No file cached, no data to sync"); - historyItems.add(new HistoryItem(currentApp.packageName, currentApp.label, new Date(), 0, "Couldn't cache application data")); + Log.i(currentApp.appInfo.packageName + ": No file cached, no data to sync"); + historyItems.add(new HistoryItem(currentApp.appInfo.packageName, currentApp.appInfo.label, new Date(), 0, "Couldn't cache application data")); return; } - Log.i(currentApp.packageName + ": Comparing new and old data"); + Log.i(currentApp.appInfo.packageName + ": Comparing new and old data"); newData = getNewData(newData, oldData); allNewData.addAll(newData); @@ -165,8 +163,8 @@ private void sync(ArrayList syncingApps) totalNewMeasurements += filteredSet.measurements.size(); } - Log.i(currentApp.packageName + ": New measurements: " + totalNewMeasurements + " across " + newData.size() + " sets"); - historyItems.add(new HistoryItem(currentApp.packageName, currentApp.label, new Date(), totalNewMeasurements, null)); + Log.i(currentApp.appInfo.packageName + ": New measurements: " + totalNewMeasurements + " across " + newData.size() + " sets"); + historyItems.add(new HistoryItem(currentApp.appInfo.packageName, currentApp.appInfo.label, new Date(), totalNewMeasurements, null)); } catch (Exception e) { @@ -177,7 +175,7 @@ private void sync(ArrayList syncingApps) Log.i("Deleted cache file: " + cacheFile.getPath() + ", result: " + deletedFile); } - historyItems.add(new HistoryItem(currentApp.packageName, currentApp.label, new Date(), 0, e.getMessage())); + historyItems.add(new HistoryItem(currentApp.appInfo.packageName, currentApp.appInfo.label, new Date(), 0, e.getMessage())); } } From 09ac2fe43c9893400c56f19fd863782f390f7c30 Mon Sep 17 00:00:00 2001 From: Quint Stoffers Date: Mon, 4 Aug 2014 15:51:29 +0200 Subject: [PATCH 2/3] Move ETL to .sync package --- .../{ => sync}/etl/ArrayDatabaseView.java | 4 +- .../quantimodo/{ => sync}/etl/ArrayTable.java | 4 +- .../{ => sync}/etl/DatabaseView.java | 2 +- .../com/quantimodo/{ => sync}/etl/ETL.java | 40 +++++++++---------- .../com/quantimodo/{ => sync}/etl/Table.java | 2 +- .../etl/converters/AccupedoConverter.java | 6 +-- .../etl/converters/CallRecorderConverter.java | 6 +-- .../etl/converters/CardiographConverter.java | 6 +-- .../{ => sync}/etl/converters/Converter.java | 4 +- .../etl/converters/DataHabitConverter.java | 6 +-- .../converters/GoodDayJournalConverter.java | 6 +-- .../converters/HowAreYouFeelingConverter.java | 6 +-- .../etl/converters/MedHelperConverter.java | 6 +-- .../etl/converters/MediSafeConverter.java | 8 ++-- .../etl/converters/MyFitnessPalConverter.java | 6 +-- .../converters/SleepAsAndroidConverter.java | 6 +-- .../converters/SportsTrackerConverter.java | 6 +-- .../converters/T2MoodTrackerConverter.java | 6 +-- .../etl/converters/ZombiesRunConverter.java | 8 ++-- .../myFitnessCompanionConverter.java | 6 +-- .../{ => sync}/etl/readers/CSVReader.java | 8 ++-- .../{ => sync}/etl/readers/Reader.java | 4 +- .../{ => sync}/etl/readers/SQLiteReader.java | 8 ++-- .../etl/readers/SpreadsheetReader.java | 8 ++-- .../etl/utils/DatabaseViewUtil.java | 5 +-- .../{ => sync}/etl/utils/ParseUtil.java | 2 +- .../{ => sync}/etl/utils/TableUtil.java | 4 +- .../sync/sync/AppDataSyncAdapter.java | 2 +- 28 files changed, 92 insertions(+), 93 deletions(-) rename app/src/main/java/com/quantimodo/{ => sync}/etl/ArrayDatabaseView.java (96%) rename app/src/main/java/com/quantimodo/{ => sync}/etl/ArrayTable.java (98%) rename app/src/main/java/com/quantimodo/{ => sync}/etl/DatabaseView.java (92%) rename app/src/main/java/com/quantimodo/{ => sync}/etl/ETL.java (69%) rename app/src/main/java/com/quantimodo/{ => sync}/etl/Table.java (92%) rename app/src/main/java/com/quantimodo/{ => sync}/etl/converters/AccupedoConverter.java (98%) rename app/src/main/java/com/quantimodo/{ => sync}/etl/converters/CallRecorderConverter.java (95%) rename app/src/main/java/com/quantimodo/{ => sync}/etl/converters/CardiographConverter.java (92%) rename app/src/main/java/com/quantimodo/{ => sync}/etl/converters/Converter.java (67%) rename app/src/main/java/com/quantimodo/{ => sync}/etl/converters/DataHabitConverter.java (96%) rename app/src/main/java/com/quantimodo/{ => sync}/etl/converters/GoodDayJournalConverter.java (94%) rename app/src/main/java/com/quantimodo/{ => sync}/etl/converters/HowAreYouFeelingConverter.java (96%) rename app/src/main/java/com/quantimodo/{ => sync}/etl/converters/MedHelperConverter.java (95%) rename app/src/main/java/com/quantimodo/{ => sync}/etl/converters/MediSafeConverter.java (95%) rename app/src/main/java/com/quantimodo/{ => sync}/etl/converters/MyFitnessPalConverter.java (96%) rename app/src/main/java/com/quantimodo/{ => sync}/etl/converters/SleepAsAndroidConverter.java (96%) rename app/src/main/java/com/quantimodo/{ => sync}/etl/converters/SportsTrackerConverter.java (97%) rename app/src/main/java/com/quantimodo/{ => sync}/etl/converters/T2MoodTrackerConverter.java (94%) rename app/src/main/java/com/quantimodo/{ => sync}/etl/converters/ZombiesRunConverter.java (90%) rename app/src/main/java/com/quantimodo/{ => sync}/etl/converters/myFitnessCompanionConverter.java (95%) rename app/src/main/java/com/quantimodo/{ => sync}/etl/readers/CSVReader.java (97%) rename app/src/main/java/com/quantimodo/{ => sync}/etl/readers/Reader.java (71%) rename app/src/main/java/com/quantimodo/{ => sync}/etl/readers/SQLiteReader.java (96%) rename app/src/main/java/com/quantimodo/{ => sync}/etl/readers/SpreadsheetReader.java (96%) rename app/src/main/java/com/quantimodo/{ => sync}/etl/utils/DatabaseViewUtil.java (95%) rename app/src/main/java/com/quantimodo/{ => sync}/etl/utils/ParseUtil.java (95%) rename app/src/main/java/com/quantimodo/{ => sync}/etl/utils/TableUtil.java (98%) diff --git a/app/src/main/java/com/quantimodo/etl/ArrayDatabaseView.java b/app/src/main/java/com/quantimodo/sync/etl/ArrayDatabaseView.java similarity index 96% rename from app/src/main/java/com/quantimodo/etl/ArrayDatabaseView.java rename to app/src/main/java/com/quantimodo/sync/etl/ArrayDatabaseView.java index a197e8f..9395e2c 100644 --- a/app/src/main/java/com/quantimodo/etl/ArrayDatabaseView.java +++ b/app/src/main/java/com/quantimodo/sync/etl/ArrayDatabaseView.java @@ -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 { diff --git a/app/src/main/java/com/quantimodo/etl/ArrayTable.java b/app/src/main/java/com/quantimodo/sync/etl/ArrayTable.java similarity index 98% rename from app/src/main/java/com/quantimodo/etl/ArrayTable.java rename to app/src/main/java/com/quantimodo/sync/etl/ArrayTable.java index f15eb54..a4356fb 100644 --- a/app/src/main/java/com/quantimodo/etl/ArrayTable.java +++ b/app/src/main/java/com/quantimodo/sync/etl/ArrayTable.java @@ -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; diff --git a/app/src/main/java/com/quantimodo/etl/DatabaseView.java b/app/src/main/java/com/quantimodo/sync/etl/DatabaseView.java similarity index 92% rename from app/src/main/java/com/quantimodo/etl/DatabaseView.java rename to app/src/main/java/com/quantimodo/sync/etl/DatabaseView.java index 7ef5cc5..672351f 100644 --- a/app/src/main/java/com/quantimodo/etl/DatabaseView.java +++ b/app/src/main/java/com/quantimodo/sync/etl/DatabaseView.java @@ -1,4 +1,4 @@ -package com.quantimodo.etl; +package com.quantimodo.sync.etl; public interface DatabaseView { diff --git a/app/src/main/java/com/quantimodo/etl/ETL.java b/app/src/main/java/com/quantimodo/sync/etl/ETL.java similarity index 69% rename from app/src/main/java/com/quantimodo/etl/ETL.java rename to app/src/main/java/com/quantimodo/sync/etl/ETL.java index 637fdc8..bdf1b48 100644 --- a/app/src/main/java/com/quantimodo/etl/ETL.java +++ b/app/src/main/java/com/quantimodo/sync/etl/ETL.java @@ -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; diff --git a/app/src/main/java/com/quantimodo/etl/Table.java b/app/src/main/java/com/quantimodo/sync/etl/Table.java similarity index 92% rename from app/src/main/java/com/quantimodo/etl/Table.java rename to app/src/main/java/com/quantimodo/sync/etl/Table.java index f547983..01caf33 100644 --- a/app/src/main/java/com/quantimodo/etl/Table.java +++ b/app/src/main/java/com/quantimodo/sync/etl/Table.java @@ -1,4 +1,4 @@ -package com.quantimodo.etl; +package com.quantimodo.sync.etl; public interface Table { diff --git a/app/src/main/java/com/quantimodo/etl/converters/AccupedoConverter.java b/app/src/main/java/com/quantimodo/sync/etl/converters/AccupedoConverter.java similarity index 98% rename from app/src/main/java/com/quantimodo/etl/converters/AccupedoConverter.java rename to app/src/main/java/com/quantimodo/sync/etl/converters/AccupedoConverter.java index 8b51f46..4e8bcbf 100644 --- a/app/src/main/java/com/quantimodo/etl/converters/AccupedoConverter.java +++ b/app/src/main/java/com/quantimodo/sync/etl/converters/AccupedoConverter.java @@ -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; diff --git a/app/src/main/java/com/quantimodo/etl/converters/CallRecorderConverter.java b/app/src/main/java/com/quantimodo/sync/etl/converters/CallRecorderConverter.java similarity index 95% rename from app/src/main/java/com/quantimodo/etl/converters/CallRecorderConverter.java rename to app/src/main/java/com/quantimodo/sync/etl/converters/CallRecorderConverter.java index f831fe0..6516e09 100644 --- a/app/src/main/java/com/quantimodo/etl/converters/CallRecorderConverter.java +++ b/app/src/main/java/com/quantimodo/sync/etl/converters/CallRecorderConverter.java @@ -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; diff --git a/app/src/main/java/com/quantimodo/etl/converters/CardiographConverter.java b/app/src/main/java/com/quantimodo/sync/etl/converters/CardiographConverter.java similarity index 92% rename from app/src/main/java/com/quantimodo/etl/converters/CardiographConverter.java rename to app/src/main/java/com/quantimodo/sync/etl/converters/CardiographConverter.java index 0462e26..ee08659 100644 --- a/app/src/main/java/com/quantimodo/etl/converters/CardiographConverter.java +++ b/app/src/main/java/com/quantimodo/sync/etl/converters/CardiographConverter.java @@ -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; diff --git a/app/src/main/java/com/quantimodo/etl/converters/Converter.java b/app/src/main/java/com/quantimodo/sync/etl/converters/Converter.java similarity index 67% rename from app/src/main/java/com/quantimodo/etl/converters/Converter.java rename to app/src/main/java/com/quantimodo/sync/etl/converters/Converter.java index 5137906..1b5d890 100644 --- a/app/src/main/java/com/quantimodo/etl/converters/Converter.java +++ b/app/src/main/java/com/quantimodo/sync/etl/converters/Converter.java @@ -1,7 +1,7 @@ -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 java.util.ArrayList; diff --git a/app/src/main/java/com/quantimodo/etl/converters/DataHabitConverter.java b/app/src/main/java/com/quantimodo/sync/etl/converters/DataHabitConverter.java similarity index 96% rename from app/src/main/java/com/quantimodo/etl/converters/DataHabitConverter.java rename to app/src/main/java/com/quantimodo/sync/etl/converters/DataHabitConverter.java index f8c1038..21d24c2 100644 --- a/app/src/main/java/com/quantimodo/etl/converters/DataHabitConverter.java +++ b/app/src/main/java/com/quantimodo/sync/etl/converters/DataHabitConverter.java @@ -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; diff --git a/app/src/main/java/com/quantimodo/etl/converters/GoodDayJournalConverter.java b/app/src/main/java/com/quantimodo/sync/etl/converters/GoodDayJournalConverter.java similarity index 94% rename from app/src/main/java/com/quantimodo/etl/converters/GoodDayJournalConverter.java rename to app/src/main/java/com/quantimodo/sync/etl/converters/GoodDayJournalConverter.java index d570d77..9f1a069 100644 --- a/app/src/main/java/com/quantimodo/etl/converters/GoodDayJournalConverter.java +++ b/app/src/main/java/com/quantimodo/sync/etl/converters/GoodDayJournalConverter.java @@ -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; diff --git a/app/src/main/java/com/quantimodo/etl/converters/HowAreYouFeelingConverter.java b/app/src/main/java/com/quantimodo/sync/etl/converters/HowAreYouFeelingConverter.java similarity index 96% rename from app/src/main/java/com/quantimodo/etl/converters/HowAreYouFeelingConverter.java rename to app/src/main/java/com/quantimodo/sync/etl/converters/HowAreYouFeelingConverter.java index 2676273..9073eb7 100644 --- a/app/src/main/java/com/quantimodo/etl/converters/HowAreYouFeelingConverter.java +++ b/app/src/main/java/com/quantimodo/sync/etl/converters/HowAreYouFeelingConverter.java @@ -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; diff --git a/app/src/main/java/com/quantimodo/etl/converters/MedHelperConverter.java b/app/src/main/java/com/quantimodo/sync/etl/converters/MedHelperConverter.java similarity index 95% rename from app/src/main/java/com/quantimodo/etl/converters/MedHelperConverter.java rename to app/src/main/java/com/quantimodo/sync/etl/converters/MedHelperConverter.java index b589f33..925d900 100644 --- a/app/src/main/java/com/quantimodo/etl/converters/MedHelperConverter.java +++ b/app/src/main/java/com/quantimodo/sync/etl/converters/MedHelperConverter.java @@ -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; diff --git a/app/src/main/java/com/quantimodo/etl/converters/MediSafeConverter.java b/app/src/main/java/com/quantimodo/sync/etl/converters/MediSafeConverter.java similarity index 95% rename from app/src/main/java/com/quantimodo/etl/converters/MediSafeConverter.java rename to app/src/main/java/com/quantimodo/sync/etl/converters/MediSafeConverter.java index 7bbb72d..ae2391c 100644 --- a/app/src/main/java/com/quantimodo/etl/converters/MediSafeConverter.java +++ b/app/src/main/java/com/quantimodo/sync/etl/converters/MediSafeConverter.java @@ -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; diff --git a/app/src/main/java/com/quantimodo/etl/converters/MyFitnessPalConverter.java b/app/src/main/java/com/quantimodo/sync/etl/converters/MyFitnessPalConverter.java similarity index 96% rename from app/src/main/java/com/quantimodo/etl/converters/MyFitnessPalConverter.java rename to app/src/main/java/com/quantimodo/sync/etl/converters/MyFitnessPalConverter.java index 9837106..36add42 100644 --- a/app/src/main/java/com/quantimodo/etl/converters/MyFitnessPalConverter.java +++ b/app/src/main/java/com/quantimodo/sync/etl/converters/MyFitnessPalConverter.java @@ -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; diff --git a/app/src/main/java/com/quantimodo/etl/converters/SleepAsAndroidConverter.java b/app/src/main/java/com/quantimodo/sync/etl/converters/SleepAsAndroidConverter.java similarity index 96% rename from app/src/main/java/com/quantimodo/etl/converters/SleepAsAndroidConverter.java rename to app/src/main/java/com/quantimodo/sync/etl/converters/SleepAsAndroidConverter.java index 52e76d1..184be14 100644 --- a/app/src/main/java/com/quantimodo/etl/converters/SleepAsAndroidConverter.java +++ b/app/src/main/java/com/quantimodo/sync/etl/converters/SleepAsAndroidConverter.java @@ -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; diff --git a/app/src/main/java/com/quantimodo/etl/converters/SportsTrackerConverter.java b/app/src/main/java/com/quantimodo/sync/etl/converters/SportsTrackerConverter.java similarity index 97% rename from app/src/main/java/com/quantimodo/etl/converters/SportsTrackerConverter.java rename to app/src/main/java/com/quantimodo/sync/etl/converters/SportsTrackerConverter.java index 59b20e7..ab5084e 100644 --- a/app/src/main/java/com/quantimodo/etl/converters/SportsTrackerConverter.java +++ b/app/src/main/java/com/quantimodo/sync/etl/converters/SportsTrackerConverter.java @@ -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; diff --git a/app/src/main/java/com/quantimodo/etl/converters/T2MoodTrackerConverter.java b/app/src/main/java/com/quantimodo/sync/etl/converters/T2MoodTrackerConverter.java similarity index 94% rename from app/src/main/java/com/quantimodo/etl/converters/T2MoodTrackerConverter.java rename to app/src/main/java/com/quantimodo/sync/etl/converters/T2MoodTrackerConverter.java index b3006a3..de2d0cc 100644 --- a/app/src/main/java/com/quantimodo/etl/converters/T2MoodTrackerConverter.java +++ b/app/src/main/java/com/quantimodo/sync/etl/converters/T2MoodTrackerConverter.java @@ -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; diff --git a/app/src/main/java/com/quantimodo/etl/converters/ZombiesRunConverter.java b/app/src/main/java/com/quantimodo/sync/etl/converters/ZombiesRunConverter.java similarity index 90% rename from app/src/main/java/com/quantimodo/etl/converters/ZombiesRunConverter.java rename to app/src/main/java/com/quantimodo/sync/etl/converters/ZombiesRunConverter.java index 853634e..0713f6f 100644 --- a/app/src/main/java/com/quantimodo/etl/converters/ZombiesRunConverter.java +++ b/app/src/main/java/com/quantimodo/sync/etl/converters/ZombiesRunConverter.java @@ -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; diff --git a/app/src/main/java/com/quantimodo/etl/converters/myFitnessCompanionConverter.java b/app/src/main/java/com/quantimodo/sync/etl/converters/myFitnessCompanionConverter.java similarity index 95% rename from app/src/main/java/com/quantimodo/etl/converters/myFitnessCompanionConverter.java rename to app/src/main/java/com/quantimodo/sync/etl/converters/myFitnessCompanionConverter.java index e51e0a2..607436e 100644 --- a/app/src/main/java/com/quantimodo/etl/converters/myFitnessCompanionConverter.java +++ b/app/src/main/java/com/quantimodo/sync/etl/converters/myFitnessCompanionConverter.java @@ -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; diff --git a/app/src/main/java/com/quantimodo/etl/readers/CSVReader.java b/app/src/main/java/com/quantimodo/sync/etl/readers/CSVReader.java similarity index 97% rename from app/src/main/java/com/quantimodo/etl/readers/CSVReader.java rename to app/src/main/java/com/quantimodo/sync/etl/readers/CSVReader.java index 9627904..aa5370c 100644 --- a/app/src/main/java/com/quantimodo/etl/readers/CSVReader.java +++ b/app/src/main/java/com/quantimodo/sync/etl/readers/CSVReader.java @@ -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; diff --git a/app/src/main/java/com/quantimodo/etl/readers/Reader.java b/app/src/main/java/com/quantimodo/sync/etl/readers/Reader.java similarity index 71% rename from app/src/main/java/com/quantimodo/etl/readers/Reader.java rename to app/src/main/java/com/quantimodo/sync/etl/readers/Reader.java index f140050..414b4ad 100644 --- a/app/src/main/java/com/quantimodo/etl/readers/Reader.java +++ b/app/src/main/java/com/quantimodo/sync/etl/readers/Reader.java @@ -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; diff --git a/app/src/main/java/com/quantimodo/etl/readers/SQLiteReader.java b/app/src/main/java/com/quantimodo/sync/etl/readers/SQLiteReader.java similarity index 96% rename from app/src/main/java/com/quantimodo/etl/readers/SQLiteReader.java rename to app/src/main/java/com/quantimodo/sync/etl/readers/SQLiteReader.java index 0df3b75..2170160 100644 --- a/app/src/main/java/com/quantimodo/etl/readers/SQLiteReader.java +++ b/app/src/main/java/com/quantimodo/sync/etl/readers/SQLiteReader.java @@ -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; diff --git a/app/src/main/java/com/quantimodo/etl/readers/SpreadsheetReader.java b/app/src/main/java/com/quantimodo/sync/etl/readers/SpreadsheetReader.java similarity index 96% rename from app/src/main/java/com/quantimodo/etl/readers/SpreadsheetReader.java rename to app/src/main/java/com/quantimodo/sync/etl/readers/SpreadsheetReader.java index ab186e5..861eae1 100644 --- a/app/src/main/java/com/quantimodo/etl/readers/SpreadsheetReader.java +++ b/app/src/main/java/com/quantimodo/sync/etl/readers/SpreadsheetReader.java @@ -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; diff --git a/app/src/main/java/com/quantimodo/etl/utils/DatabaseViewUtil.java b/app/src/main/java/com/quantimodo/sync/etl/utils/DatabaseViewUtil.java similarity index 95% rename from app/src/main/java/com/quantimodo/etl/utils/DatabaseViewUtil.java rename to app/src/main/java/com/quantimodo/sync/etl/utils/DatabaseViewUtil.java index 5e6f76a..3f735c9 100644 --- a/app/src/main/java/com/quantimodo/etl/utils/DatabaseViewUtil.java +++ b/app/src/main/java/com/quantimodo/sync/etl/utils/DatabaseViewUtil.java @@ -1,7 +1,6 @@ -package com.quantimodo.etl.utils; +package com.quantimodo.sync.etl.utils; -import com.quantimodo.etl.DatabaseView; -import com.quantimodo.etl.utils.TableUtil; +import com.quantimodo.sync.etl.DatabaseView; import java.io.IOException; diff --git a/app/src/main/java/com/quantimodo/etl/utils/ParseUtil.java b/app/src/main/java/com/quantimodo/sync/etl/utils/ParseUtil.java similarity index 95% rename from app/src/main/java/com/quantimodo/etl/utils/ParseUtil.java rename to app/src/main/java/com/quantimodo/sync/etl/utils/ParseUtil.java index 65bd041..2eae9a4 100644 --- a/app/src/main/java/com/quantimodo/etl/utils/ParseUtil.java +++ b/app/src/main/java/com/quantimodo/sync/etl/utils/ParseUtil.java @@ -1,4 +1,4 @@ -package com.quantimodo.etl.utils; +package com.quantimodo.sync.etl.utils; import java.text.ParseException; import java.text.SimpleDateFormat; diff --git a/app/src/main/java/com/quantimodo/etl/utils/TableUtil.java b/app/src/main/java/com/quantimodo/sync/etl/utils/TableUtil.java similarity index 98% rename from app/src/main/java/com/quantimodo/etl/utils/TableUtil.java rename to app/src/main/java/com/quantimodo/sync/etl/utils/TableUtil.java index 65e4be8..7bb6735 100644 --- a/app/src/main/java/com/quantimodo/etl/utils/TableUtil.java +++ b/app/src/main/java/com/quantimodo/sync/etl/utils/TableUtil.java @@ -1,6 +1,6 @@ -package com.quantimodo.etl.utils; +package com.quantimodo.sync.etl.utils; -import com.quantimodo.etl.Table; +import com.quantimodo.sync.etl.Table; import java.io.IOException; diff --git a/app/src/main/java/com/quantimodo/sync/sync/AppDataSyncAdapter.java b/app/src/main/java/com/quantimodo/sync/sync/AppDataSyncAdapter.java index bd12fd3..9e3322e 100644 --- a/app/src/main/java/com/quantimodo/sync/sync/AppDataSyncAdapter.java +++ b/app/src/main/java/com/quantimodo/sync/sync/AppDataSyncAdapter.java @@ -6,7 +6,7 @@ import android.database.sqlite.SQLiteDatabase; import android.os.Bundle; import android.os.Handler; -import com.quantimodo.etl.ETL; +import com.quantimodo.sync.etl.ETL; import com.quantimodo.android.sdk.QuantimodoApi; import com.quantimodo.android.sdk.model.Measurement; import com.quantimodo.android.sdk.model.MeasurementSet; From 2ed0ea2446e119de3da37ac7d7f6cdfafe12c02f Mon Sep 17 00:00:00 2001 From: Quint Stoffers Date: Mon, 4 Aug 2014 15:54:26 +0200 Subject: [PATCH 3/3] Added getAppInfo method to Converter interface --- .../java/com/quantimodo/sync/etl/converters/Converter.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/src/main/java/com/quantimodo/sync/etl/converters/Converter.java b/app/src/main/java/com/quantimodo/sync/etl/converters/Converter.java index 1b5d890..bd07776 100644 --- a/app/src/main/java/com/quantimodo/sync/etl/converters/Converter.java +++ b/app/src/main/java/com/quantimodo/sync/etl/converters/Converter.java @@ -2,11 +2,14 @@ import com.quantimodo.android.sdk.model.MeasurementSet; import com.quantimodo.sync.etl.DatabaseView; +import com.quantimodo.sync.model.SyncableAppInfo; import java.util.ArrayList; public interface Converter { ArrayList convert(DatabaseView databaseView); + + SyncableAppInfo getAppInfo(); }