Skip to content

Install app's own default bookmarks configuration #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sorydima wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Install app's own default bookmarks configuration #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion app/src/main/java/org/freenetproject/mobile/services/node/Installer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ private Installer() { }

private final String FREENET_INI = "freenet.ini";
private final String SEEDNODES = "seednodes.fref";
private final String BOOKMARKS = "bookmarks.dat";

public static Installer getInstance() {
if (instance == null) {
Expand All @@ -35,10 +36,11 @@ public static Installer getInstance() {
* @param path Path to installation location.
* @param seeds Input stream of seeds file.
* @param config Input stream of default configuration.
* @param bookmarks Input stream of default bookmarks
*
* @throws FileNotFoundException
*/
public void install(String path, InputStream seeds, InputStream config, String lang) throws FileNotFoundException {
public void install(String path, InputStream seeds, InputStream config, InputStream bookmarks, String lang) throws FileNotFoundException {
File f = new File(path);
if (!f.exists() || !f.canWrite()) {
throw new FileNotFoundException("Invalid installation directory: " + path);
Expand All @@ -49,6 +51,7 @@ public void install(String path, InputStream seeds, InputStream config, String l
// Install bundled configurations
createConfiguration(seeds, getSeednodesPath());
createConfiguration(config, getFreenetIniPath());
createConfiguration(bookmarks, getBookmarksPath());

// Update freenet.ini with dynamic configuration
final FileOutputStream ini = new FileOutputStream(getFreenetIniPath(), true);
Expand Down Expand Up @@ -138,4 +141,8 @@ public String getSeednodesPath() {
public String getFreenetIniPath() {
return path + "/" + FREENET_INI;
}

public String getBookmarksPath() {
return path + "/" + BOOKMARKS;
}
}
1 change: 1 addition & 0 deletions app/src/main/java/org/freenetproject/mobile/services/node/Manager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ public int startService(Context context) {
context.getDir("data", Context.MODE_PRIVATE).getAbsolutePath(),
res.openRawResource(R.raw.seednodes),
res.openRawResource(R.raw.freenet),
res.openRawResource(R.raw.bookmarks),
res.getConfiguration().locale.getDisplayLanguage()
);
} catch (FileNotFoundException e) {
Expand Down
3 changes: 3 additions & 0 deletions app/src/main/res/raw/bookmarks.dat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
BookmarkCategory=4
Version=1
End