r4sas/lightning-i2p
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Fixed bug when long pressing bookmarks, removed unused strings

Browse Source
This commit is contained in:
Anthony Restaino 2015-07-29 22:01:01 -04:00
parent 240c9a5a37
commit 399037d49b
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/main/java/acr/browser/lightning/activity/BrowserActivity.java
View File

@ -2535,13 +2535,19 @@ public abstract class BrowserActivity extends ThemableActivity implements Browse
} }
private void longPressFolder(String url) { private void longPressFolder(String url) {
// We are getting the title from the url String title;
// Strip '-bookmarks.html' from the end of the url if (url.startsWith(Constants.FILE)) {
String title = url.substring(0, url.length() - BookmarkPage.FILENAME.length() - 1); // We are getting the title from the url
// Strip '-bookmarks.html' from the end of the url
// Strip the beginning of the url off and leave only the title title = url.substring(0, url.length() - BookmarkPage.FILENAME.length() - 1);
title = title.substring(Constants.FILE.length() + mActivity.getFilesDir().toString().length() + 1);
// Strip the beginning of the url off and leave only the title
title = title.substring(Constants.FILE.length() + mActivity.getFilesDir().toString().length() + 1);
} else if (url.startsWith(Constants.FOLDER)) {
title = url.substring(Constants.FOLDER.length());
} else {
title = url;
}
final int position = BookmarkManager.getIndexOfBookmark(mBookmarkList, Constants.FOLDER + title); final int position = BookmarkManager.getIndexOfBookmark(mBookmarkList, Constants.FOLDER + title);
if (position == -1) { if (position == -1) {
return; return;
@ -2581,7 +2587,7 @@ public abstract class BrowserActivity extends ThemableActivity implements Browse
} }
private void longPressBookmarkLink(final String url) { private void longPressBookmarkLink(final String url) {
if (url.startsWith(Constants.FILE)) { if (url.startsWith(Constants.FILE) || url.startsWith(Constants.FOLDER)) {
longPressFolder(url); longPressFolder(url);
return; return;
} }

6
app/src/main/res/values-fr/strings.xml
View File

@ -1,22 +1,16 @@
<resources> <resources>
<string name="app_name">Lightning</string> <string name="app_name">Lightning</string>
<string name="google">Google</string>
<string name="tabs">Onglets</string> <string name="tabs">Onglets</string>
<string name="settings">Paramètres</string> <string name="settings">Paramètres</string>
<string name="location">Accéder à ma position</string> <string name="location">Accéder à ma position</string>
<string name="password">Enregistrer les mots de passe</string> <string name="password">Enregistrer les mots de passe</string>
<string name="agent">User Agent</string> <string name="agent">User Agent</string>
<string name="history">Effacer l\'historique</string>
<string name="clear_cookies_exit">Effacer les cookies en quittant</string> <string name="clear_cookies_exit">Effacer les cookies en quittant</string>
<string name="clear_history_exit">Effacer l\'historique en quittant</string> <string name="clear_history_exit">Effacer l\'historique en quittant</string>
<string name="email">Contactez moi</string>
<string name="flash">Activer Adobe Flash Player</string> <string name="flash">Activer Adobe Flash Player</string>
<string name="block_ads">Bloquer les publicités</string> <string name="block_ads">Bloquer les publicités</string>
<string name="block">Bloquer les images</string> <string name="block">Bloquer les images</string>
<string name="third_party">Bloquer les cookies tiers</string> <string name="third_party">Bloquer les cookies tiers</string>
<string name="mobile">Voir la version mobile</string>
<string name="desk">Voir la version ordinateur</string>
<string name="custom">Utiliser un User Agent personnalisé</string>
<string name="home">Au démarrage</string> <string name="home">Au démarrage</string>
<string name="fullscreen">Activer le mode plein écran</string> <string name="fullscreen">Activer le mode plein écran</string>
<string name="java">Activer JavaScript</string> <string name="java">Activer JavaScript</string>