dan
/
tor-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

intent api: restore key

This commit is contained in:
arrase 2016-11-27 20:07:49 +01:00
parent 5d3b171e21
commit bb7ffd9692
2 changed files with 934 additions and 1039 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1965
app/src/main/java/org/torproject/android/OrbotMainActivity.java
View File

File diff suppressed because it is too large Load Diff

8
app/src/main/java/org/torproject/android/ui/hiddenservices/backup/BackupUtils.java
View File

@ -58,7 +58,7 @@ public class BackupUtils {
JSONObject config = new JSONObject();
try {
if (portData.getCount() != 1)
if (portData == null || portData.getCount() != 1)
return null;
portData.moveToNext();
@ -184,7 +184,7 @@ public class BackupUtils {
null
);
if (service.getCount() == 0) {
if (service == null || service.getCount() == 0) {
mResolver.insert(HSContentProvider.CONTENT_URI, fields);
} else {
mResolver.update(
@ -193,9 +193,9 @@ public class BackupUtils {
HSContentProvider.HiddenService.PORT + "=" + port,
null
);
}
service.close();
service.close();
}
} catch (JSONException e) {
e.printStackTrace();