From 985635de224145288238f26ccf6ad69aa8c9dbaf Mon Sep 17 00:00:00 2001 From: doo Date: Sun, 22 Jan 2012 01:38:35 +0100 Subject: [PATCH] backup mostly(not sure about image size, but have a guess) works --- MeditationTracker/AndroidManifest.xml | 21 ++++--- .../gen/com/meditationtracker/R.java | 8 +-- MeditationTracker/gen/doo/util/root/R.java | 8 +-- MeditationTracker/res/layout-land/session.xml | 12 ++-- MeditationTracker/res/layout/main.xml | 4 +- .../res/layout/new_meditation.xml | 37 +++++------- MeditationTracker/res/layout/post_install.xml | 49 ++++++++++----- MeditationTracker/res/layout/practice.xml | 6 +- .../res/layout/practice_list_item.xml | 51 ++++------------ MeditationTracker/res/layout/schedule.xml | 4 +- MeditationTracker/res/layout/session.xml | 8 +-- MeditationTracker/res/values-de/strings.xml | 12 ++-- MeditationTracker/res/values-es/strings.xml | 2 +- MeditationTracker/res/values-it/strings.xml | 2 +- MeditationTracker/res/values-pl/strings.xml | 2 +- MeditationTracker/res/values-ru/strings.xml | 9 +-- MeditationTracker/res/values-uk/strings.xml | 9 +-- MeditationTracker/res/values/strings.xml | 14 +++-- .../PracticeImageProvider.java | 17 +++--- .../controls/NoScrollListView.java | 11 ++-- .../sync/backup/AllFilesBackupHelper.java | 59 +++++++++++++++++++ .../sync/backup/BackupAgent.java | 39 +++++------- .../sync/backup/BackupManagerWrapper.java | 1 + .../sync/backup/MeditationBackupHelper.java | 32 ---------- .../sync/backup/RealBackupManager.java | 2 + dootil/res/layout/main.xml | 12 ---- 26 files changed, 218 insertions(+), 213 deletions(-) mode change 100644 => 100755 MeditationTracker/res/layout-land/session.xml mode change 100644 => 100755 MeditationTracker/res/layout/main.xml mode change 100644 => 100755 MeditationTracker/res/layout/new_meditation.xml mode change 100644 => 100755 MeditationTracker/res/layout/post_install.xml mode change 100644 => 100755 MeditationTracker/res/layout/practice.xml mode change 100644 => 100755 MeditationTracker/res/layout/practice_list_item.xml mode change 100644 => 100755 MeditationTracker/res/layout/schedule.xml mode change 100644 => 100755 MeditationTracker/res/layout/session.xml mode change 100644 => 100755 MeditationTracker/res/values-de/strings.xml mode change 100644 => 100755 MeditationTracker/res/values-es/strings.xml mode change 100644 => 100755 MeditationTracker/res/values-it/strings.xml mode change 100644 => 100755 MeditationTracker/res/values-pl/strings.xml mode change 100644 => 100755 MeditationTracker/res/values-ru/strings.xml mode change 100644 => 100755 MeditationTracker/res/values-uk/strings.xml mode change 100644 => 100755 MeditationTracker/res/values/strings.xml mode change 100644 => 100755 MeditationTracker/src/com/meditationtracker/controls/NoScrollListView.java create mode 100755 MeditationTracker/src/com/meditationtracker/sync/backup/AllFilesBackupHelper.java delete mode 100755 MeditationTracker/src/com/meditationtracker/sync/backup/MeditationBackupHelper.java delete mode 100644 dootil/res/layout/main.xml diff --git a/MeditationTracker/AndroidManifest.xml b/MeditationTracker/AndroidManifest.xml index 4a69eba..51227ab 100755 --- a/MeditationTracker/AndroidManifest.xml +++ b/MeditationTracker/AndroidManifest.xml @@ -1,18 +1,24 @@ + android:versionName="Torma" > + + + + + + android:theme="@android:style/Theme.Light.NoTitleBar" > @@ -44,11 +50,10 @@ - - - - - + + \ No newline at end of file diff --git a/MeditationTracker/gen/com/meditationtracker/R.java b/MeditationTracker/gen/com/meditationtracker/R.java index d42d7a9..93740a9 100755 --- a/MeditationTracker/gen/com/meditationtracker/R.java +++ b/MeditationTracker/gen/com/meditationtracker/R.java @@ -62,7 +62,7 @@ public static final class id { public static final int LinearLayout01=0x7f090005; public static final int LinearLayout02=0x7f090012; public static final int LinearLayout03=0x7f09000f; - public static final int RelativeLayout01=0x7f09002b; + public static final int RelativeLayout01=0x7f09002c; public static final int ScrollView01=0x7f090004; public static final int TableLayout01=0x7f090020; public static final int TableLayout02=0x7f090024; @@ -80,7 +80,6 @@ public static final class id { public static final int editPracticeButton=0x7f09001e; public static final int headerLayout=0x7f090000; public static final int imageSourceGroup=0x7f09003b; - public static final int imgMore=0x7f09002d; public static final int imgPractice=0x7f09001f; public static final int linearLayout1=0x7f090002; public static final int menuBar=0x7f09000b; @@ -89,7 +88,7 @@ public static final class id { public static final int openPractice=0x7f09003e; public static final int pickerScheduledEndDate=0x7f090033; public static final int practiceImage=0x7f09000c; - public static final int practiceImg=0x7f09002c; + public static final int practiceImg=0x7f09002d; public static final int practiceProgressBar=0x7f090023; public static final int practiceTitle=0x7f09002e; public static final int prefTimePicker=0x7f090038; @@ -110,7 +109,7 @@ public static final class id { public static final int textMalaSize=0x7f090016; public static final int textPracticeName=0x7f09000e; public static final int textRepetitionCount=0x7f090011; - public static final int textScheduledEndDate=0x7f09002a; + public static final int textScheduledEndDate=0x7f09002b; public static final int textScheduledForToday=0x7f090025; public static final int textTimer=0x7f090034; public static final int textVersion=0x7f090003; @@ -124,6 +123,7 @@ public static final class id { public static final int titlePracticeName=0x7f09000d; public static final int titleRepetitionCount=0x7f090010; public static final int titleReqRepetitions=0x7f090021; + public static final int titleScheduledCompletionDate=0x7f09002a; public static final int titleScheduledForToday=0x7f090026; } public static final class layout { diff --git a/MeditationTracker/gen/doo/util/root/R.java b/MeditationTracker/gen/doo/util/root/R.java index 20350f1..eb2d852 100755 --- a/MeditationTracker/gen/doo/util/root/R.java +++ b/MeditationTracker/gen/doo/util/root/R.java @@ -62,7 +62,7 @@ public static final class id { public static final int LinearLayout01=0x7f090005; public static final int LinearLayout02=0x7f090012; public static final int LinearLayout03=0x7f09000f; - public static final int RelativeLayout01=0x7f09002b; + public static final int RelativeLayout01=0x7f09002c; public static final int ScrollView01=0x7f090004; public static final int TableLayout01=0x7f090020; public static final int TableLayout02=0x7f090024; @@ -80,7 +80,6 @@ public static final class id { public static final int editPracticeButton=0x7f09001e; public static final int headerLayout=0x7f090000; public static final int imageSourceGroup=0x7f09003b; - public static final int imgMore=0x7f09002d; public static final int imgPractice=0x7f09001f; public static final int linearLayout1=0x7f090002; public static final int menuBar=0x7f09000b; @@ -89,7 +88,7 @@ public static final class id { public static final int openPractice=0x7f09003e; public static final int pickerScheduledEndDate=0x7f090033; public static final int practiceImage=0x7f09000c; - public static final int practiceImg=0x7f09002c; + public static final int practiceImg=0x7f09002d; public static final int practiceProgressBar=0x7f090023; public static final int practiceTitle=0x7f09002e; public static final int prefTimePicker=0x7f090038; @@ -110,7 +109,7 @@ public static final class id { public static final int textMalaSize=0x7f090016; public static final int textPracticeName=0x7f09000e; public static final int textRepetitionCount=0x7f090011; - public static final int textScheduledEndDate=0x7f09002a; + public static final int textScheduledEndDate=0x7f09002b; public static final int textScheduledForToday=0x7f090025; public static final int textTimer=0x7f090034; public static final int textVersion=0x7f090003; @@ -124,6 +123,7 @@ public static final class id { public static final int titlePracticeName=0x7f09000d; public static final int titleRepetitionCount=0x7f090010; public static final int titleReqRepetitions=0x7f090021; + public static final int titleScheduledCompletionDate=0x7f09002a; public static final int titleScheduledForToday=0x7f090026; } public static final class layout { diff --git a/MeditationTracker/res/layout-land/session.xml b/MeditationTracker/res/layout-land/session.xml old mode 100644 new mode 100755 index 62a2dc5..0635360 --- a/MeditationTracker/res/layout-land/session.xml +++ b/MeditationTracker/res/layout-land/session.xml @@ -13,15 +13,15 @@ android:layout_height="fill_parent" android:orientation="horizontal"> - + + android:layout_width="fill_parent"> + android:src="@drawable/karmapa" android:id="@+id/imgPractice" + android:layout_width="wrap_content" android:layout_gravity="center" android:paddingLeft="10dp"> + android:layout_height="wrap_content" android:addStatesFromChildren="true"> - + android:layout_height="wrap_content"> + android:layout_marginLeft="10dip" android:layout_marginRight="10dip" android:inputType="text|textCapSentences|textAutoCorrect"> + android:layout_height="wrap_content" android:layout_width="fill_parent" android:baselineAligned="false"> @@ -50,25 +47,21 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="vertical" android:layout_weight="1"> + android:layout_marginRight="10dip" + android:textColor="#000000"> + android:inputType="number"> diff --git a/MeditationTracker/res/layout/post_install.xml b/MeditationTracker/res/layout/post_install.xml old mode 100644 new mode 100755 index 36436db..9babce7 --- a/MeditationTracker/res/layout/post_install.xml +++ b/MeditationTracker/res/layout/post_install.xml @@ -1,19 +1,38 @@ - + - - - + - + + - - - + + + + + \ No newline at end of file diff --git a/MeditationTracker/res/layout/practice.xml b/MeditationTracker/res/layout/practice.xml old mode 100644 new mode 100755 index 4443ad2..59f053a --- a/MeditationTracker/res/layout/practice.xml +++ b/MeditationTracker/res/layout/practice.xml @@ -1,6 +1,6 @@ @@ -109,7 +109,7 @@ android:layout_height="wrap_content" android:id="@+id/rowScheduledCompletion"> + android:textColor="#000000" android:id="@+id/titleScheduledCompletionDate"> - - - - - + + + android:id="@+id/LinearLayout01" android:layout_width="fill_parent" android:orientation="vertical" android:layout_height="fill_parent"> - + http://dooreelkow.blogspot.com/2011/05/iv-ii.html - Über... + Über… Hi! v5 \'108\' \n\nProgrammierung von Doo Reelkow. @@ -73,9 +73,11 @@ Sitzungsfenster wird während später Meditationen abgeblendet Version - Willkommen zum neuen Meditations Tracker. + Grüezi und willkommen zum neuen Meditations Tracker. \n\nDas ist immer noch nicht die \"Google - Documents\" version. Das einzelne was geändert wird ist besseres support für - den übungsbildwahl. Und dass ist die letzte mit support für android 1.5. - \n\nGrüss, Doo Reelkow. + Documents\" version. Besser. Ab jetzt Meditationen und deren Stand wird automatisch synchroniziert in neuen + Geräten durch google cloud. Dass heisst dass Datenexport für Analyse ist jetzt etwa unnötig aber vielleicht + mache ich es trotzdem. Später. + \n\nMeditiern! + \n\nGrüsse, Doo Reelkow. diff --git a/MeditationTracker/res/values-es/strings.xml b/MeditationTracker/res/values-es/strings.xml old mode 100644 new mode 100755 index 15481e5..fd91ce1 --- a/MeditationTracker/res/values-es/strings.xml +++ b/MeditationTracker/res/values-es/strings.xml @@ -56,7 +56,7 @@ Nuevo tamaño de mala http://dooreelkow.blogspot.com/2011/05/iv-ii.html - Sobre... + Sobre… Hola! v5 \'108\' \n\nProgramación de Doo Reelkow. diff --git a/MeditationTracker/res/values-it/strings.xml b/MeditationTracker/res/values-it/strings.xml old mode 100644 new mode 100755 index c5bca85..d919a2d --- a/MeditationTracker/res/values-it/strings.xml +++ b/MeditationTracker/res/values-it/strings.xml @@ -59,7 +59,7 @@ http://dooreelkow.blogspot.com/2011/05/iv-ii.html - Su... + Su… Ciao! v5 \'108\' \n\nScritta da Doo Reelkow.\n diff --git a/MeditationTracker/res/values-pl/strings.xml b/MeditationTracker/res/values-pl/strings.xml old mode 100644 new mode 100755 index b57bfbe..3e155d3 --- a/MeditationTracker/res/values-pl/strings.xml +++ b/MeditationTracker/res/values-pl/strings.xml @@ -53,7 +53,7 @@ Dodaj male Ustaw ilość http://dooreelkow.blogspot.com/2011/05/iv-ii.html - O programie... + O programie… Witaj! v5 \'108\' \n\nAutor: Doo Reelkow diff --git a/MeditationTracker/res/values-ru/strings.xml b/MeditationTracker/res/values-ru/strings.xml old mode 100644 new mode 100755 index 9ef0ade..dc48234 --- a/MeditationTracker/res/values-ru/strings.xml +++ b/MeditationTracker/res/values-ru/strings.xml @@ -56,7 +56,7 @@ Добавить Задать число - О программе... + О программе… Привет! v5 \'108\' \n\nНаписана Doo Reelkow @@ -75,8 +75,9 @@ Версия Приветствую в новом трекере!\n\nЭто ещё не версия с - Гуглодокументами. На самом деле, всё что изменилось - это вроде бы окончательно - работает выбор картинки для практики. И ещё этот релиз - последний с поддержкой - андроида 1.5\nУдачной практики! + Гуглодокументами. Лучше. Это версия, синхронизирующая своё состояние через интернет. Теперь при покупке новго + телефона все данные о практиках и прогрессе будут автоматически синхронизироваться. + \nНу и теперь экспорт данных для графиков в экселе стал малозначительным. + \n\nУдачной практики! \n\nВаш, Doo Reelkow. diff --git a/MeditationTracker/res/values-uk/strings.xml b/MeditationTracker/res/values-uk/strings.xml old mode 100644 new mode 100755 index a8a6a0c..2a469c8 --- a/MeditationTracker/res/values-uk/strings.xml +++ b/MeditationTracker/res/values-uk/strings.xml @@ -56,7 +56,7 @@ Додати Вказати кількість - Про програму... + Про програму… Вітання! v5 \'108\' \n\nНаписана Doo Reelkow\n @@ -74,9 +74,10 @@ Затемнювати екран сесії ввечері Версія Вітаю в новому трекері!\n - \nЦе ще не реліз з Гугль-документами. Насправді все що змінилось - сподіваюсь остаточно - працює обирання картинок для практики. До цього ж цей реліз останній з підртимкой андроїда 1.5. - \nПрактикуймо!\n + \nЦе ще не реліз з Гугль-документами. Ліпше. Відтепер дані про практики та прогрес автоматично будуть + синхронизувати через інтернет в нових телефонах після покупки. + Експорт в ексель тепер непотрібний але мо колись й зроблю. + \n\nПрактикуймо!\n \nВаш, Doo Reelkow. \ No newline at end of file diff --git a/MeditationTracker/res/values/strings.xml b/MeditationTracker/res/values/strings.xml old mode 100644 new mode 100755 index cc42528..83d4a28 --- a/MeditationTracker/res/values/strings.xml +++ b/MeditationTracker/res/values/strings.xml @@ -11,7 +11,7 @@ Edit meditation Countdown Stopwatch - Stop watch or countdown? + Stopwatch or countdown? Play sound Session length min. Mala size @@ -57,7 +57,7 @@ Set count http://dooreelkow.blogspot.com/2011/05/iv-ii.html - About... + About… Hi! v5 \'108\' \n\nWritten by Doo Reelkow.\n @@ -74,10 +74,12 @@ Dim session screen during late meditations Version Welcome to the new meditation tracker. - \n\nThis is not the promised big google-synchronising release. In fact the only change is - hopefully final fix for image picking(please check if it still works) and - decision that this is the last release supporting android 1.5. - \nKeep up your practices! + \n\nThis is not the promised big google-synchronising release. + It\'s better. It\'s a small google-synchronizing release. For devices running 2.2 and up + Meditation Tracker will now keep its state in android settings cloud. This means that + when you download this app to the new phone it\'ll automatically synchronize your practices and progress. + \nExporting practice entries for reporting and graphs is postponed and I guess is somewhat irrelevant now. + \n\nKeep up your practices! \n\nYours, Doo Reelkow. \ No newline at end of file diff --git a/MeditationTracker/src/com/meditationtracker/PracticeImageProvider.java b/MeditationTracker/src/com/meditationtracker/PracticeImageProvider.java index 80a8fd8..ca49c4b 100755 --- a/MeditationTracker/src/com/meditationtracker/PracticeImageProvider.java +++ b/MeditationTracker/src/com/meditationtracker/PracticeImageProvider.java @@ -37,7 +37,7 @@ public ParcelFileDescriptor openFile(Uri uri, String mode) throws FileNotFoundEx } @Override - public int delete(Uri uri, String selection, String[] selectionArgs) + public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) { throw new UnsupportedOperationException(NOT_SUPPORTED_BY_THIS_PROVIDER); } @@ -45,31 +45,30 @@ public int delete(Uri uri, String selection, String[] selectionArgs) @Override public String getType(Uri uri) { - throw new UnsupportedOperationException(NOT_SUPPORTED_BY_THIS_PROVIDER); + return android.provider.MediaStore.Images.Media.CONTENT_TYPE; } @Override - public Uri insert(Uri uri, ContentValues values) + public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) { throw new UnsupportedOperationException(NOT_SUPPORTED_BY_THIS_PROVIDER); } @Override - public boolean onCreate() + public int delete(Uri uri, String selection, String[] selectionArgs) { - return true; + throw new UnsupportedOperationException(NOT_SUPPORTED_BY_THIS_PROVIDER); } @Override - public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) + public Uri insert(Uri uri, ContentValues values) { throw new UnsupportedOperationException(NOT_SUPPORTED_BY_THIS_PROVIDER); } @Override - public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) + public boolean onCreate() { - throw new UnsupportedOperationException(NOT_SUPPORTED_BY_THIS_PROVIDER); + return true; } - } diff --git a/MeditationTracker/src/com/meditationtracker/controls/NoScrollListView.java b/MeditationTracker/src/com/meditationtracker/controls/NoScrollListView.java old mode 100644 new mode 100755 index 64cf758..a14d957 --- a/MeditationTracker/src/com/meditationtracker/controls/NoScrollListView.java +++ b/MeditationTracker/src/com/meditationtracker/controls/NoScrollListView.java @@ -3,7 +3,6 @@ import android.content.Context; import android.graphics.Rect; import android.util.AttributeSet; -import android.util.Log; import android.view.MotionEvent; import android.view.View; import android.widget.ListView; @@ -60,7 +59,7 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) if (newChildHeight != 0) fullHeight = getListPaddingTop() + getListPaddingBottom() + /*getVerticalFadingEdgeLength() * 2*/ + newChildHeight; - Log.d("MTRK", String.format("Measured. Cnt: %d, ChildCnt: %d, childHeight: %d, fullHeight: %d", getCount(), getChildCount(), childHeight, fullHeight)); +// Log.d("MTRK", String.format("Measured. Cnt: %d, ChildCnt: %d, childHeight: %d, fullHeight: %d", getCount(), getChildCount(), childHeight, fullHeight)); setMeasuredDimension(getMeasuredWidth(), fullHeight); } @@ -68,21 +67,21 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) @Override public boolean requestChildRectangleOnScreen(View child, Rect rect, boolean immediate) { - Log.d("MTRK", "===== requestChildRectangleOnScreen"); +// Log.d("MTRK", "===== requestChildRectangleOnScreen"); forceRelayoutIfNeeded(); return super.requestChildRectangleOnScreen(child, rect, immediate); } @Override public boolean onTouchEvent(MotionEvent ev) { - Log.d("MTRK", "===== onTouchEvent"); +// Log.d("MTRK", "===== onTouchEvent"); forceRelayoutIfNeeded(); return super.onTouchEvent(ev); } @Override protected void layoutChildren() { - Log.d("MTRK", "===== layoutChildren"); +// Log.d("MTRK", "===== layoutChildren"); super.layoutChildren(); forceRelayoutIfNeeded(); @@ -90,7 +89,7 @@ protected void layoutChildren() { private void forceRelayoutIfNeeded() { if (assumedMeasurements) { - Log.d("MTRK", "Forcing relayout"); +// Log.d("MTRK", "Forcing relayout"); requestLayout(); } } diff --git a/MeditationTracker/src/com/meditationtracker/sync/backup/AllFilesBackupHelper.java b/MeditationTracker/src/com/meditationtracker/sync/backup/AllFilesBackupHelper.java new file mode 100755 index 0000000..6f27631 --- /dev/null +++ b/MeditationTracker/src/com/meditationtracker/sync/backup/AllFilesBackupHelper.java @@ -0,0 +1,59 @@ +package com.meditationtracker.sync.backup; + +import java.io.File; +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.List; + +import com.meditationtracker.PracticeDatabase; + +import android.app.backup.BackupDataInputStream; +import android.app.backup.FileBackupHelper; +import android.content.Context; +import android.util.Log; + + +public class AllFilesBackupHelper extends FileBackupHelper { + + private static File mFilesDir; + + public AllFilesBackupHelper(Context context) { + super(context, getFiles(context)); + // TODO Auto-generated constructor stub + } + + private static String[] getFiles(Context context) { + List files = new ArrayList(); + files.add("../databases/" + PracticeDatabase.DBNAME); + + Log.d("MTRK", "File backup"); + mFilesDir = context.getFilesDir(); + for (File f : mFilesDir.listFiles()) { + String fname = f.getName(); + files.add(fname); + Log.d("MTRK", "Adding " + fname + " to backup"); + } + + return files.toArray(new String[0]); + } + + //XXX: WTF: Actually overloading the isKeyInList should've been enough if it wasn't package-private + @Override + public void restoreEntity(BackupDataInputStream data) { + Log.d("MTRK", "got entity '" + data.getKey() + "' size=" + data.size()); + String key = data.getKey(); + File f = new File(mFilesDir, key); + +// writeFile(f, data); + try { + Method declaredMethod = FileBackupHelper.class.getSuperclass().getDeclaredMethod("writeFile", new Class[] { File.class, BackupDataInputStream.class}); + declaredMethod.setAccessible(true); + declaredMethod.invoke(this, f, data); + } catch (Exception e) { + // TODO Auto-generated catch block + Log.e("MTRK", "Failed restoring file", e); + } + + } + +} diff --git a/MeditationTracker/src/com/meditationtracker/sync/backup/BackupAgent.java b/MeditationTracker/src/com/meditationtracker/sync/backup/BackupAgent.java index 2478b2c..856e657 100755 --- a/MeditationTracker/src/com/meditationtracker/sync/backup/BackupAgent.java +++ b/MeditationTracker/src/com/meditationtracker/sync/backup/BackupAgent.java @@ -1,42 +1,35 @@ package com.meditationtracker.sync.backup; -import java.io.File; import java.io.IOException; -import java.util.ArrayList; -import java.util.List; - -import com.meditationtracker.PracticeDatabase; +import android.app.backup.BackupDataInput; import android.app.backup.BackupHelper; -import android.app.backup.FileBackupHelper; import android.app.backup.SharedPreferencesBackupHelper; +import android.os.ParcelFileDescriptor; + +import com.meditationtracker.PracticeDatabase; public class BackupAgent extends android.app.backup.BackupAgentHelper { private BackupHelper prefsHelper; - //private BackupHelper meditationHelper; + private AllFilesBackupHelper dbData; @Override public void onCreate() { super.onCreate(); - + prefsHelper = new SharedPreferencesBackupHelper(this); addHelper("settings", prefsHelper); - -/* meditationHelper = new MeditationBackupHelper(); - addHelper("meditations", meditationHelper);*/ - - - List files = new ArrayList(); - files.add("../databases/" + PracticeDatabase.DBNAME); - - File filesDir = getFilesDir(); - for (File f : filesDir.listFiles()) { - files.add(f.getAbsolutePath()); - } - - FileBackupHelper dbData = new FileBackupHelper(this, - (String[])files.toArray()); + + dbData = new AllFilesBackupHelper(this); addHelper(PracticeDatabase.DBNAME, dbData); } + + @Override + public void onRestore(BackupDataInput data, int appVersionCode, ParcelFileDescriptor newState) + throws IOException { + super.onRestore(data, appVersionCode, newState); + } + + } diff --git a/MeditationTracker/src/com/meditationtracker/sync/backup/BackupManagerWrapper.java b/MeditationTracker/src/com/meditationtracker/sync/backup/BackupManagerWrapper.java index b79b546..2e211cc 100755 --- a/MeditationTracker/src/com/meditationtracker/sync/backup/BackupManagerWrapper.java +++ b/MeditationTracker/src/com/meditationtracker/sync/backup/BackupManagerWrapper.java @@ -10,6 +10,7 @@ public class BackupManagerWrapper { public BackupManagerWrapper(Context context) { try { instance = new RealBackupManager(context); + Log.d("MTRK", "Can do backup ops"); }catch (VerifyError e) { Log.d("MTRK", "Will skip backup ops"); instance = new DummyBackupManager(context); diff --git a/MeditationTracker/src/com/meditationtracker/sync/backup/MeditationBackupHelper.java b/MeditationTracker/src/com/meditationtracker/sync/backup/MeditationBackupHelper.java deleted file mode 100755 index e31bde7..0000000 --- a/MeditationTracker/src/com/meditationtracker/sync/backup/MeditationBackupHelper.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.meditationtracker.sync.backup; - -import android.app.backup.BackupAgentHelper; -import android.app.backup.BackupDataInputStream; -import android.app.backup.BackupDataOutput; -import android.app.backup.BackupHelper; -import android.os.ParcelFileDescriptor; - -public class MeditationBackupHelper extends BackupAgentHelper implements BackupHelper { - - public MeditationBackupHelper() { - } - - @Override - public void performBackup(ParcelFileDescriptor arg0, BackupDataOutput arg1, ParcelFileDescriptor arg2) { - // TODO Auto-generated method stub - - } - - @Override - public void restoreEntity(BackupDataInputStream arg0) { - // TODO Auto-generated method stub - - } - - @Override - public void writeNewStateDescription(ParcelFileDescriptor arg0) { - // TODO Auto-generated method stub - - } - -} diff --git a/MeditationTracker/src/com/meditationtracker/sync/backup/RealBackupManager.java b/MeditationTracker/src/com/meditationtracker/sync/backup/RealBackupManager.java index c5b8325..d97eb42 100755 --- a/MeditationTracker/src/com/meditationtracker/sync/backup/RealBackupManager.java +++ b/MeditationTracker/src/com/meditationtracker/sync/backup/RealBackupManager.java @@ -3,6 +3,7 @@ import android.app.backup.BackupManager; import android.app.backup.RestoreObserver; import android.content.Context; +import android.util.Log; public class RealBackupManager implements IBackupManager { private BackupManager instance; @@ -14,6 +15,7 @@ public RealBackupManager(Context context) { @Override public void dataChanged() { instance.dataChanged(); + Log.d("MTRK", "Asked backup ops"); } @Override diff --git a/dootil/res/layout/main.xml b/dootil/res/layout/main.xml deleted file mode 100644 index 3a5f117..0000000 --- a/dootil/res/layout/main.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - -