Skip to content

Visual editor migration #4187

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

Merged
aforcier merged 2 commits into from
Jun 8, 2016
Merged

Visual editor migration #4187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f661ff
remove 5.4-rc force enabling
maxme Jun 7, 2016
9c67b1d
migrate 5.5 users to the visual editor
maxme Jun 7, 2016
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
10 changes: 0 additions & 10 deletions WordPress/src/main/java/org/wordpress/android/WordPress.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,16 +216,6 @@ public void onCreate() {

// If users uses a custom locale set it on start of application
WPActivityUtils.applyLocale(getContext());

// TODO: remove this after the visual editor is enabled in a release version (5.4 if everything goes well)
enableVisualEditorForBetaUsers();
}

private void enableVisualEditorForBetaUsers() {
if (BuildConfig.VERSION_NAME.contains("5.4-rc")) {
AppPrefs.setVisualEditorAvailable(true);
AppPrefs.setVisualEditorEnabled(true);
}
}

private void initAnalytics(final long elapsedTimeOnCreate) {
Expand Down
6 changes: 5 additions & 1 deletion WordPress/src/main/java/org/wordpress/android/WordPressDB.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public class WordPressDB {
public static final String COLUMN_NAME_VIDEO_PRESS_SHORTCODE = "videoPressShortcode";
public static final String COLUMN_NAME_UPLOAD_STATE = "uploadState";

private static final int DATABASE_VERSION = 46;
private static final int DATABASE_VERSION = 47;

private static final String CREATE_TABLE_BLOGS = "create table if not exists accounts (id integer primary key autoincrement, "
+ "url text, blogName text, username text, password text, imagePlacement text, centerThumbnail boolean, fullSizeImage boolean, maxImageWidth text, maxImageWidthId integer);";
Expand Down Expand Up @@ -419,6 +419,10 @@ public WordPressDB(Context ctx) {
case 45:
db.execSQL(ADD_BLOGS_CAPABILITIES);
currentVersion++;
case 46:
AppPrefs.setVisualEditorAvailable(true);
AppPrefs.setVisualEditorEnabled(true);
currentVersion++;
}
db.setVersion(DATABASE_VERSION);
}
Expand Down