diff --git a/CHANGELOG b/CHANGELOG index bc3c139c9..e1c3ee981 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,6 @@ 2.0: NEW: Clean history button +NEW: Open new tab in background - settings option 1.99 FIXED: ZIM load error on ICS diff --git a/src/org/kiwix/kiwixmobile/KiwixMobileActivity.java b/src/org/kiwix/kiwixmobile/KiwixMobileActivity.java index 132f38600..91279cd1c 100644 --- a/src/org/kiwix/kiwixmobile/KiwixMobileActivity.java +++ b/src/org/kiwix/kiwixmobile/KiwixMobileActivity.java @@ -1842,9 +1842,9 @@ public class KiwixMobileActivity extends AppCompatActivity { class ViewHolder { - TextView txtTitle; + private TextView txtTitle; - ImageView exit; + private ImageView exit; } } diff --git a/src/org/kiwix/kiwixmobile/SearchActivity.java b/src/org/kiwix/kiwixmobile/SearchActivity.java index 1e3ae4154..d3f874830 100644 --- a/src/org/kiwix/kiwixmobile/SearchActivity.java +++ b/src/org/kiwix/kiwixmobile/SearchActivity.java @@ -45,6 +45,7 @@ public class SearchActivity extends AppCompatActivity implements AdapterView.OnI getSupportActionBar().setHomeButtonEnabled(true); String zimFile = getIntent().getStringExtra("zimFile"); + zimFile = escapeSqlSyntax(zimFile); mListView = (ListView) findViewById(R.id.search_list); mDatabaseHelper = new DatabaseHelper(this, zimFile); SQLiteDatabase db = mDatabaseHelper.getWritableDatabase(); @@ -113,6 +114,7 @@ public class SearchActivity extends AppCompatActivity implements AdapterView.OnI @Override public void onItemClick(AdapterView parent, View view, int position, long id) { String title = ((TextView) view).getText().toString(); + title = escapeSqlSyntax(title); mDatabaseHelper.insertSearch(title); sendMessage(title); } diff --git a/src/org/kiwix/kiwixmobile/utils/DatabaseHelper.java b/src/org/kiwix/kiwixmobile/utils/DatabaseHelper.java index 4f54a601c..42e90d8ca 100644 --- a/src/org/kiwix/kiwixmobile/utils/DatabaseHelper.java +++ b/src/org/kiwix/kiwixmobile/utils/DatabaseHelper.java @@ -20,7 +20,7 @@ public class DatabaseHelper extends SQLiteOpenHelper { public static final String CONTACTS_COLUMN_ID = "id"; public static final String CONTACTS_COLUMN_SEARCH = "search"; public static final String CONTACTS_COLUMN_ZIM = "zim"; - public static String zimFile; + public String zimFile; public DatabaseHelper(Context context, String zimFile) {