mirror/Anki-Android
0
0
Fork 0
mirror of https://github.com/ankidroid/Anki-Android.git synced 2024-09-20 03:52:15 +02:00
Code

Merged 'f5b684e' from hotfix-2.3.1: Extend NookHD+ compat class to NookHD

Browse Source
This commit is contained in:
timrae 2014-11-07 16:20:51 +09:00
commit a13088d7c2
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/ichi2/anki/AnkiDroidApp.java
View File

@ -36,7 +36,7 @@ import com.ichi2.anki.exception.AnkiDroidErrorReportException;
import com.ichi2.async.Connection;
import com.ichi2.compat.Compat;
import com.ichi2.compat.CompatV15;
import com.ichi2.compat.CompatV15NookHdPlus;
import com.ichi2.compat.CompatV15NookHdOrHdPlus;
import com.ichi2.compat.CompatV16;
import com.ichi2.compat.CompatV7;
import com.ichi2.compat.CompatV7Nook;
@ -123,8 +123,8 @@ public class AnkiDroidApp extends Application {
public void onCreate() {
super.onCreate();
if (isNookHdPlus() && AnkiDroidApp.SDK_VERSION == 15) {
mCompat = new CompatV15NookHdPlus();
if (isNookHdOrHdPlus() && AnkiDroidApp.SDK_VERSION == 15) {
mCompat = new CompatV15NookHdOrHdPlus();
} else if (AnkiDroidApp.SDK_VERSION >= 16) {
mCompat = new CompatV16();
} else if (AnkiDroidApp.SDK_VERSION >= 15) {
@ -175,10 +175,18 @@ public class AnkiDroidApp extends Application {
}
public static boolean isNookHdPlus() {
private boolean isNookHdOrHdPlus() {
return isNookHd() || isNookHdPlus();
}
private boolean isNookHdPlus() {
return android.os.Build.BRAND.equals("NOOK") && android.os.Build.PRODUCT.equals("HDplus")
&& android.os.Build.DEVICE.equals("ovation");
}
private boolean isNookHd () {
return android.os.Build.MODEL.equalsIgnoreCase("bntv400") && android.os.Build.BRAND.equals("NOOK");
}
public static boolean isNook() {

2
src/com/ichi2/compat/CompatV15NookHdPlus.java → src/com/ichi2/compat/CompatV15NookHdOrHdPlus.java
View File

@ -11,7 +11,7 @@ import android.database.sqlite.SQLiteDatabase;
* device.
*/
@TargetApi(16)
public class CompatV15NookHdPlus extends CompatV15 implements Compat {
public class CompatV15NookHdOrHdPlus extends CompatV15 implements Compat {
@Override
public void disableDatabaseWriteAheadLogging(SQLiteDatabase db) {