diff --git a/app/build.gradle b/app/build.gradle index 58e57ce6..1d451598 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ android { applicationId "jp.juggler.subwaytooter" minSdkVersion 21 targetSdkVersion 25 - versionCode 22 - versionName "0.2.2" + versionCode 24 + versionName "0.2.4" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/java/jp/juggler/subwaytooter/App1.java b/app/src/main/java/jp/juggler/subwaytooter/App1.java index 82462d4a..c61bb6a0 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/App1.java +++ b/app/src/main/java/jp/juggler/subwaytooter/App1.java @@ -33,10 +33,11 @@ public class App1 extends Application { static final String DB_NAME = "app_db"; - static final int DB_VERSION = 5; + static final int DB_VERSION = 6; // 2017/4/25 v10 1=>2 SavedAccount に通知設定を追加 // 2017/4/25 v10 1=>2 NotificationTracking テーブルを追加 // 2017/4/29 v20 2=>5 MediaShown,ContentWarningのインデクスが間違っていたので貼り直す + // 2017/4/29 v23 5=>6 MutedAppテーブルの追加、UserRelationテーブルの追加 static DBOpenHelper db_open_helper; public static SQLiteDatabase getDB(){ @@ -177,10 +178,10 @@ public class App1 extends Application { if( db_open_helper == null ){ db_open_helper = new DBOpenHelper( getApplicationContext() ); - if( BuildConfig.DEBUG){ - SQLiteDatabase db = db_open_helper.getWritableDatabase(); - db_open_helper.onCreate( db ); - } +// if( BuildConfig.DEBUG){ +// SQLiteDatabase db = db_open_helper.getWritableDatabase(); +// db_open_helper.onCreate( db ); +// } } if( image_loader == null ){ diff --git a/app/src/main/java/jp/juggler/subwaytooter/Column.java b/app/src/main/java/jp/juggler/subwaytooter/Column.java index bd4adc84..ac836b93 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/Column.java +++ b/app/src/main/java/jp/juggler/subwaytooter/Column.java @@ -654,7 +654,7 @@ class Column { } } - dst.add( status ); + dst.add( item ); } } diff --git a/app/src/main/java/jp/juggler/subwaytooter/table/MutedApp.java b/app/src/main/java/jp/juggler/subwaytooter/table/MutedApp.java index cdbfbcdd..289987f7 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/table/MutedApp.java +++ b/app/src/main/java/jp/juggler/subwaytooter/table/MutedApp.java @@ -32,7 +32,9 @@ public class MutedApp { } public static void onDBUpgrade( SQLiteDatabase db, int oldVersion, int newVersion ){ - + if(oldVersion < 6 && newVersion >= 6){ + onDBCreate( db ); + } } public static void save( String app_name ){ diff --git a/app/src/main/java/jp/juggler/subwaytooter/table/UserRelation.java b/app/src/main/java/jp/juggler/subwaytooter/table/UserRelation.java index 73f1de1b..a6ed4361 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/table/UserRelation.java +++ b/app/src/main/java/jp/juggler/subwaytooter/table/UserRelation.java @@ -48,7 +48,9 @@ public class UserRelation { } public static void onDBUpgrade( SQLiteDatabase db, int oldVersion, int newVersion ){ - + if(oldVersion < 6 && newVersion >= 6){ + onDBCreate( db ); + } } public static void deleteOld( long now){