Skip to content

Commit 6226ba6

Browse files
committed
Moves implementation to a separate package
1 parent a8f2246 commit 6226ba6

6 files changed

Lines changed: 37 additions & 34 deletions

File tree

WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
import org.wordpress.android.editor.EditorMediaUtils;
7272
import org.wordpress.android.editor.EditorThemeUpdateListener;
7373
import org.wordpress.android.editor.ExceptionLogger;
74-
import org.wordpress.android.editor.SavedInstanceDatabase;
74+
import org.wordpress.android.editor.savedinstance.SavedInstanceDatabase;
7575
import org.wordpress.android.editor.gutenberg.DialogVisibility;
7676
import org.wordpress.android.editor.gutenberg.GutenbergEditorFragment;
7777
import org.wordpress.android.editor.gutenberg.GutenbergPropsBuilder;

libs/editor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergContainerFragment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import org.wordpress.android.editor.BuildConfig;
1616
import org.wordpress.android.editor.ExceptionLogger;
1717
import org.wordpress.android.editor.R;
18-
import org.wordpress.android.editor.SavedInstanceDatabase;
18+
import org.wordpress.android.editor.savedinstance.SavedInstanceDatabase;
1919
import org.wordpress.mobile.WPAndroidGlue.ShowSuggestionsUtil;
2020
import org.wordpress.mobile.WPAndroidGlue.GutenbergProps;
2121
import org.wordpress.mobile.WPAndroidGlue.RequestExecutor;

libs/editor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergEditorFragment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
import org.wordpress.android.editor.EditorThemeUpdateListener;
4848
import org.wordpress.android.editor.LiveTextWatcher;
4949
import org.wordpress.android.editor.R;
50-
import org.wordpress.android.editor.SavedInstanceDatabase;
50+
import org.wordpress.android.editor.savedinstance.SavedInstanceDatabase;
5151
import org.wordpress.android.editor.WPGutenbergWebViewActivity;
5252
import org.wordpress.android.editor.gutenberg.GutenbergDialogFragment.GutenbergDialogNegativeClickInterface;
5353
import org.wordpress.android.editor.gutenberg.GutenbergDialogFragment.GutenbergDialogPositiveClickInterface;
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
package org.wordpress.android.editor.savedinstance
2+
3+
import android.os.Parcel
4+
import android.os.Parcelable
5+
6+
class ParcelableObject {
7+
private val parcel = Parcel.obtain()
8+
9+
constructor(parcelable: Parcelable) {
10+
parcelable.writeToParcel(parcel, 0)
11+
}
12+
13+
constructor(data: ByteArray) {
14+
parcel.unmarshall(data, 0, data.size)
15+
parcel.setDataPosition(0)
16+
}
17+
18+
fun toBytes(): ByteArray {
19+
return parcel.marshall()
20+
}
21+
22+
fun getParcel(): Parcel {
23+
parcel.setDataPosition(0)
24+
return parcel
25+
}
26+
27+
fun recycle() {
28+
parcel.recycle()
29+
}
30+
}

libs/editor/src/main/java/org/wordpress/android/editor/SavedInstanceDatabase.kt renamed to libs/editor/src/main/java/org/wordpress/android/editor/savedinstance/SavedInstanceDatabase.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package org.wordpress.android.editor
1+
package org.wordpress.android.editor.savedinstance
22

33
import android.content.Context
44
import android.database.sqlite.SQLiteDatabase
55
import android.database.sqlite.SQLiteOpenHelper
66
import android.os.Parcelable
7-
import org.wordpress.android.editor.SavedParcelTable.createTable
8-
import org.wordpress.android.editor.SavedParcelTable.dropTable
7+
import org.wordpress.android.editor.savedinstance.SavedParcelTable.createTable
8+
import org.wordpress.android.editor.savedinstance.SavedParcelTable.dropTable
99

1010
/**
1111
* Database for the saved instance state data

libs/editor/src/main/java/org/wordpress/android/editor/SavedParcelTable.kt renamed to libs/editor/src/main/java/org/wordpress/android/editor/savedinstance/SavedParcelTable.kt

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
package org.wordpress.android.editor
1+
package org.wordpress.android.editor.savedinstance
22

33
import android.content.ContentValues
44
import android.database.sqlite.SQLiteDatabase
5-
import android.os.Parcel
65
import android.os.Parcelable
76
import org.wordpress.android.util.SqlUtils
87

@@ -54,30 +53,4 @@ object SavedParcelTable {
5453
SqlUtils.closeCursor(c)
5554
}
5655
}
57-
58-
private class ParcelableObject {
59-
private val parcel = Parcel.obtain()
60-
61-
constructor(parcelable: Parcelable) {
62-
parcelable.writeToParcel(parcel, 0)
63-
}
64-
65-
constructor(data: ByteArray) {
66-
parcel.unmarshall(data, 0, data.size)
67-
parcel.setDataPosition(0)
68-
}
69-
70-
fun toBytes(): ByteArray {
71-
return parcel.marshall()
72-
}
73-
74-
fun getParcel(): Parcel {
75-
parcel.setDataPosition(0)
76-
return parcel
77-
}
78-
79-
fun recycle() {
80-
parcel.recycle()
81-
}
82-
}
8356
}

0 commit comments

Comments
 (0)