Skip to content

Commit 8507529

Browse files
committed
Disable download for inMemoryDatabase
1 parent bd32b48 commit 8507529

File tree

2 files changed

+21
-10
lines changed

2 files changed

+21
-10
lines changed

debug-db/src/main/assets/app.js

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,13 @@ function getDBList() {
7070
for(var count = 0; count < dbList.length; count++){
7171
var dbName = dbList[count][0];
7272
var isEncrypted = dbList[count][1];
73+
var isDownloadable = dbList[count][2];
7374
var dbAttribute = isEncrypted == "true" ? ' <span class="glyphicon glyphicon-lock" aria-hidden="true" style="color:blue"></span>' : "";
7475
if(dbName.indexOf("journal") == -1){
75-
$("#db-list").append("<a href='#' id=" + dbName + " class='list-group-item' onClick='openDatabaseAndGetTableList(\""+ dbName + "\");'>" + dbName + dbAttribute + "</a>");
76+
$("#db-list").append("<a href='#' id=" + dbName + " class='list-group-item' onClick='openDatabaseAndGetTableList(\""+ dbName + "\", \""+ isDownloadable + "\");'>" + dbName + dbAttribute + "</a>");
7677
if(!isSelectionDone){
7778
isSelectionDone = true;
78-
$('#db-list').find('a').trigger('click');
79+
$('#db-list').find('a').trigger('click');
7980
}
8081
}
8182
}
@@ -85,7 +86,7 @@ function getDBList() {
8586
}
8687

8788
var lastTableName = getHashValue('table');
88-
function openDatabaseAndGetTableList(db) {
89+
function openDatabaseAndGetTableList(db, isDownloadable) {
8990

9091
if("APP_SHARED_PREFERENCES" == db) {
9192
$('#run-query').removeClass('active');
@@ -97,10 +98,16 @@ function openDatabaseAndGetTableList(db) {
9798
} else {
9899
$('#run-query').removeClass('disabled');
99100
$('#run-query').addClass('active');
100-
$('#selected-db-info').removeClass('disabled');
101-
$('#selected-db-info').addClass('active');
101+
if("true" == isDownloadable) {
102+
$('#selected-db-info').removeClass('disabled');
103+
$('#selected-db-info').addClass('active');
104+
$("#selected-db-info").text("Export Selected Database : "+db);
105+
} else {
106+
$('#selected-db-info').removeClass('active');
107+
$('#selected-db-info').addClass('disabled');
108+
$("#selected-db-info").text("Selected Database : "+db);
109+
}
102110
isDatabaseSelected = true;
103-
$("#selected-db-info").text("Export Selected Database : "+db);
104111
}
105112

106113

@@ -110,7 +117,11 @@ function openDatabaseAndGetTableList(db) {
110117
var tableList = result.rows;
111118
var dbVersion = result.dbVersion;
112119
if("APP_SHARED_PREFERENCES" != db) {
113-
$("#selected-db-info").text("Export Selected Database : "+db +" Version : "+dbVersion);
120+
if("true" == isDownloadable) {
121+
$("#selected-db-info").text("Export Selected Database : "+db +" Version : "+dbVersion);
122+
} else {
123+
$("#selected-db-info").text("Selected Database : "+db +" Version : "+dbVersion);
124+
}
114125
}
115126
$('#table-list').empty()
116127
for(var count = 0; count < tableList.length; count++){

debug-db/src/main/java/com/amitshekhar/server/RequestHandler.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -203,17 +203,17 @@ private String getDBListResponse() {
203203
Response response = new Response();
204204
if (mDatabaseFiles != null) {
205205
for (HashMap.Entry<String, Pair<File, String>> entry : mDatabaseFiles.entrySet()) {
206-
String[] dbEntry = {entry.getKey(), !entry.getValue().second.equals("") ? "true" : "false"};
206+
String[] dbEntry = {entry.getKey(), !entry.getValue().second.equals("") ? "true" : "false", "true"};
207207
response.rows.add(dbEntry);
208208
}
209209
}
210210
if (mRoomInMemoryDatabases != null) {
211211
for (HashMap.Entry<String, SupportSQLiteDatabase> entry : mRoomInMemoryDatabases.entrySet()) {
212-
String[] dbEntry = {entry.getKey(), "false"};
212+
String[] dbEntry = {entry.getKey(), "false", "false"};
213213
response.rows.add(dbEntry);
214214
}
215215
}
216-
response.rows.add(new String[]{Constants.APP_SHARED_PREFERENCES, "false"});
216+
response.rows.add(new String[]{Constants.APP_SHARED_PREFERENCES, "false", "false"});
217217
response.isSuccessful = true;
218218
return mGson.toJson(response);
219219
}

0 commit comments

Comments
 (0)