Skip to content

Commit

Permalink
Clean up lint warnings before we make beta release 2.3.0-beta.
Browse files Browse the repository at this point in the history
  • Loading branch information
@erickok
erickok committed Oct 28, 2014
1 parent 6a7cc5c commit 164a2d2
Show file tree
Hide file tree
Showing 12 changed files with 8 additions and 216 deletions.
2 changes: 1 addition & 1 deletion app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ android {
minSdkVersion 15
targetSdkVersion 19
versionCode 216
versionName '2.3.0'
versionName '2.3.0-beta'
}
signingConfigs {
release {
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/transdroid/core/service/AppUpdateService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ private String[] retrieveLatestVersion(AbstractHttpClient httpclient, String url
@SuppressWarnings("deprecation")
private void newNotification(String ticker, String title, String text, String downloadUrl, int notifyID) {
PendingIntent pi = PendingIntent.getActivity(this, notifyID,
new Intent(Intent.ACTION_VIEW, Uri.parse(downloadUrl)), Intent.FLAG_ACTIVITY_NEW_TASK);
new Intent(Intent.ACTION_VIEW, Uri.parse(downloadUrl)), PendingIntent.FLAG_UPDATE_CURRENT);
Builder builder = new Notification.Builder(this).setSmallIcon(R.drawable.ic_stat_notification)
.setTicker(ticker).setContentTitle(title).setContentText(text)
.setLights(notificationSettings.getDesiredLedColour(), 600, 1000)
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/transdroid/daemon/Torrent.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ public Torrent(long id, String hash, String name, TorrentStatus statusCode, Stri
// Finished but no finished date: set so move to bottom of list
Calendar cal = Calendar.getInstance();
cal.clear();
cal.set(1900, 12, 31);
cal.set(1900, Calendar.DECEMBER, 31);
this.dateDone = cal.getTime();
} else if (eta == -1 || eta == -2) {
// UNknown eta: move to the top of the list
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/java/org/transdroid/daemon/util/TlsSniSocketFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
*/
package org.transdroid.daemon.util;

import android.annotation.TargetApi;
import android.net.SSLCertificateSocketFactory;
import android.os.Build;

Expand Down Expand Up @@ -98,6 +99,7 @@ public boolean isSecure(Socket s) throws IllegalArgumentException {
// TLS layer

@Override
@TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
public Socket createSocket(Socket plainSocket, String host, int port, boolean autoClose) throws IOException {
if (autoClose) {
// we don't need the plainSocket
Expand Down
3 changes: 1 addition & 2 deletions app/src/main/res/layout/dialog_color_picker.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
android:id="@+id/color_picker_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_gravity="center_horizontal"
android:tag="portrait"
android:layerType="software"
/>
Expand All @@ -46,7 +46,6 @@
android:layout_width="wrap_content"
android:layout_height="40dp"
android:orientation="horizontal"
android:layout_below="@id/color_picker_view"
android:layout_marginBottom="10dp">

<net.margaritov.preference.colorpicker.ColorPickerPanelView
Expand Down
32 changes: 0 additions & 32 deletions app/src/main/res/values-cs/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,14 +79,6 @@ along with Transdroid. If not, see <http://www.gnu.org/licenses/>.
<string name="navigation_status_onlyup">Odesílání</string>
<string name="navigation_status_onlyactive">Aktivní</string>
<string name="navigation_status_onlyinactive">Neaktivní</string>
<plurals name="navigation_torrentsselected">
<item quantity="one">%1$d torrent selected</item>
<item quantity="other">%1$d torrents selected</item>
</plurals>
<plurals name="navigation_filesselected">
<item quantity="one">%1$d files selected</item>
<item quantity="other">%1$d files selected</item>
</plurals>
<string name="navigation_selectall">Vybrat vše</string>
<string name="navigation_selectfinished">Vybrat dokončené</string>
<string name="navigation_invertselection">Obrátit výběr</string>
Expand Down Expand Up @@ -124,18 +116,6 @@ along with Transdroid. If not, see <http://www.gnu.org/licenses/>.
<string name="status_maxspeed_unit">kB/s</string>
<string name="status_maxspeed_reset">Reset</string>
<string name="status_update">Obnovit</string>
<plurals name="status_service_added">
<item quantity="one">New torrent added</item>
<item quantity="other">%1$s new torrents added</item>
</plurals>
<plurals name="status_service_finished">
<item quantity="one">Torrent is finished</item>
<item quantity="other">%1$s torrents are finished</item>
</plurals>
<plurals name="status_service_addedfinished">
<item quantity="one">%1$s added, %2$s finished torrent</item>
<item quantity="other">%1$s added, %2$s finished torrents</item>
</plurals>
<string name="status_service_andothers">%1$s a jiné</string>

<string name="labels_showall">Všechny štítky</string>
Expand Down Expand Up @@ -177,25 +157,13 @@ along with Transdroid. If not, see <http://www.gnu.org/licenses/>.
<string name="search_openingdetails">Otevírání detailů pro %1$s</string>
<string name="search_barcodescannernotfound">Barcode Scanner není nainstalován. Chtete otevřít Google Play?</string>
<string name="search_filemanagernotfound">Nebyl nalezen kompatibilní správce souborů. Chcete nainstalovat IO File Manager z Google Play?</string>
<plurals name="search_resutlsselected">
<item quantity="one">%1$d result selected</item>
<item quantity="other">%1$d results selected</item>
</plurals>

<string name="rss_feeds">RSS kanál</string>
<string name="rss_nosettings">Nemáte nadefinovaný žádný RSS kanál. Specifické torrentové RSS kanály vás informují o nových verzích a o úplně nových torrentech.</string>
<string name="rss_noselection">Vyberte RSS kanál pro zobrazení nových torrentů.</string>
<string name="rss_empty">RSS kanál nyní není dostupný nebo je prázdný</string>
<string name="rss_notloaded">Prosím počkejte, dokud se RSS kanál nenačte</string>
<string name="rss_error">Promiňte, tento RSS kanál nejde načíst v tuto chvíli</string>
<plurals name="rss_itemsselected">
<item quantity="one">%1$d item selected</item>
<item quantity="other">%1$d items selected</item>
</plurals>
<plurals name="rss_service_new">
<item quantity="one">New RSS feed torrent available</item>
<item quantity="other">%1$s new RSS feed torrents</item>
</plurals>
<string name="rss_service_newfor">Nový torrent pro %1$s</string>

<string name="widget_loading">Načítání&#8230;</string>
Expand Down
32 changes: 0 additions & 32 deletions app/src/main/res/values-fr/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,14 +79,6 @@ along with Transdroid. If not, see <http://www.gnu.org/licenses/>.
<string name="navigation_status_onlyup">Envoi</string>
<string name="navigation_status_onlyactive">Actif</string>
<string name="navigation_status_onlyinactive">Inactif</string>
<plurals name="navigation_torrentsselected">
<item quantity="one">%1$d torrent selected</item>
<item quantity="other">%1$d torrents selected</item>
</plurals>
<plurals name="navigation_filesselected">
<item quantity="one">%1$d files selected</item>
<item quantity="other">%1$d files selected</item>
</plurals>
<string name="navigation_selectall">Sélectionner tout</string>
<string name="navigation_selectfinished">Sélectionner les terminés</string>
<string name="navigation_invertselection">Inverser la sélection</string>
Expand Down Expand Up @@ -123,18 +115,6 @@ along with Transdroid. If not, see <http://www.gnu.org/licenses/>.
<string name="status_maxspeed_unit">KB/S</string>
<string name="status_maxspeed_reset">Réinitialiser</string>
<string name="status_update">Mise à jour</string>
<plurals name="status_service_added">
<item quantity="one">New torrent added</item>
<item quantity="other">%1$s new torrents added</item>
</plurals>
<plurals name="status_service_finished">
<item quantity="one">Torrent is finished</item>
<item quantity="other">%1$s torrents are finished</item>
</plurals>
<plurals name="status_service_addedfinished">
<item quantity="one">%1$s added, %2$s finished torrent</item>
<item quantity="other">%1$s added, %2$s finished torrents</item>
</plurals>
<string name="status_service_andothers">%1$s et autres</string>

<string name="labels_showall">Toutes les étiquettes</string>
Expand Down Expand Up @@ -176,25 +156,13 @@ along with Transdroid. If not, see <http://www.gnu.org/licenses/>.
<string name="search_openingdetails">Ouverture des détails pour %1$s</string>
<string name="search_barcodescannernotfound">Le scanner de code-barres n\'a pas pu être trouvé. Voulez-vous l\'installer depuis le Play Store ?</string>
<string name="search_filemanagernotfound">Aucun gestionnaire de fichiers compatible trouvé. Voulez-vous installer IO Gestionnaire de fichiers depuis le Play Store ?</string>
<plurals name="search_resutlsselected">
<item quantity="one">%1$d result selected</item>
<item quantity="other">%1$d results selected</item>
</plurals>

<string name="rss_feeds">Flux RSS</string>
<string name="rss_nosettings">Vous n\'avez pas encore défini de flux RSS à suivre. Les Torrent spécifiques aux flux RSS vous tiennent à jour des nouvelles versions et êtes averti de nouveaux éléments.</string>
<string name="rss_noselection">Sélectionnez un flux RSS pour afficher les nouveaux éléments</string>
<string name="rss_empty">Le flux RSS n\'est pas disponible ou il ne contient aucun élément</string>
<string name="rss_notloaded">Désolé, veuillez attendre que le flux RSS soit chargé</string>
<string name="rss_error">Désolé, ce flux RSS ne peut être chargé pour le moment</string>
<plurals name="rss_itemsselected">
<item quantity="one">%1$d item selected</item>
<item quantity="other">%1$d items selected</item>
</plurals>
<plurals name="rss_service_new">
<item quantity="one">New RSS feed torrent available</item>
<item quantity="other">%1$s new RSS feed torrents</item>
</plurals>
<string name="rss_service_newfor">Nouveaux torrents de %1$s</string>

<string name="widget_loading">Chargement&#8230;</string>
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/values-it/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,8 @@ along with Transdroid. If not, see <http://www.gnu.org/licenses/>.
<string name="status_ofsize">DI %1$s</string>
<string name="status_unknowneta">ETA SCONOSCIUTO</string>
<string name="status_ratio">RATIO %1$s</string>
<string name="status_seeders">%1$s DI %2$ SEEDER</string>
<string name="status_leechers">%1$s DI %2$ LEECHER</string>
<string name="status_seeders">%1$s DI %2$s SEEDER</string>
<string name="status_leechers">%1$s DI %2$s LEECHER</string>
<string name="status_downloading">In download</string>
<string name="status_seeding">In invio</string>
<string name="status_paused">In pausa</string>
Expand Down
25 changes: 0 additions & 25 deletions app/src/main/res/values-ko/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,14 +78,6 @@ along with Transdroid. If not, see <http://www.gnu.org/licenses/>.
<string name="navigation_status_onlyup">업로드</string>
<string name="navigation_status_onlyactive">활성</string>
<string name="navigation_status_onlyinactive">비활성</string>
<plurals name="navigation_torrentsselected">
<item quantity="one">%1$d torrent selected</item>
<item quantity="other">%1$d torrents selected</item>
</plurals>
<plurals name="navigation_filesselected">
<item quantity="one">%1$d files selected</item>
<item quantity="other">%1$d files selected</item>
</plurals>
<string name="navigation_selectall">모두 선택</string>
<string name="navigation_selectfinished">완료 항목 선택</string>
<string name="navigation_invertselection">선택 영역 반전</string>
Expand Down Expand Up @@ -124,18 +116,6 @@ along with Transdroid. If not, see <http://www.gnu.org/licenses/>.
<string name="status_maxspeed_unit">KB/S</string>
<string name="status_maxspeed_reset">초기화</string>
<string name="status_update">업데이트</string>
<plurals name="status_service_added">
<item quantity="one">New torrent added</item>
<item quantity="other">%1$s new torrents added</item>
</plurals>
<plurals name="status_service_finished">
<item quantity="one">Torrent is finished</item>
<item quantity="other">%1$s torrents are finished</item>
</plurals>
<plurals name="status_service_addedfinished">
<item quantity="one">%1$s added, %2$s finished torrent</item>
<item quantity="other">%1$s added, %2$s finished torrents</item>
</plurals>
<string name="status_service_andothers">%1$s 등</string>

<string name="labels_showall">모든 라벨</string>
Expand Down Expand Up @@ -177,11 +157,6 @@ along with Transdroid. If not, see <http://www.gnu.org/licenses/>.
<string name="search_openingdetails">%1$s 세부 정보 여는 중</string>
<string name="search_barcodescannernotfound">바코드 스캐너 앱을 찾을 수 없습니다. Play 스토어에서 설치하시겠습니까?</string>
<string name="search_filemanagernotfound">호환되는 파일 관리자를 찾을 수 없습니다. Play 스토어에서 IO File Manager를 설치하시겠습니까?</string>
<plurals name="search_resutlsselected">
<item quantity="one">%1$d result selected</item>
<item quantity="other">%1$d results selected</item>
</plurals>

<string name="rss_feeds">RSS 피드</string>
<string name="rss_noselection">새 항목을 보려면 RSS 피드를 선택하세요</string>
<string name="rss_empty">RSS 피드를 사용할 수 없거나, 피드에 포함된 항목이 없습니다</string>
Expand Down
32 changes: 0 additions & 32 deletions app/src/main/res/values-ru/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,14 +77,6 @@ along with Transdroid. If not, see <http://www.gnu.org/licenses/>.
<string name="navigation_status_onlyup">Раздающиеся</string>
<string name="navigation_status_onlyactive">Активные</string>
<string name="navigation_status_onlyinactive">Неактивные</string>
<plurals name="navigation_torrentsselected">
<item quantity="one">%1$d torrent selected</item>
<item quantity="other">%1$d torrents selected</item>
</plurals>
<plurals name="navigation_filesselected">
<item quantity="one">%1$d files selected</item>
<item quantity="other">%1$d files selected</item>
</plurals>
<string name="navigation_selectall">Выбрать все</string>
<string name="navigation_selectfinished">Выбрать завершенные</string>
<string name="navigation_invertselection">Инвертировать отмеч.</string>
Expand Down Expand Up @@ -122,18 +114,6 @@ along with Transdroid. If not, see <http://www.gnu.org/licenses/>.
<string name="status_maxspeed_unit">KB/S</string>
<string name="status_maxspeed_reset">Сброс</string>
<string name="status_update">Обнов.</string>
<plurals name="status_service_added">
<item quantity="one">New torrent added</item>
<item quantity="other">%1$s new torrents added</item>
</plurals>
<plurals name="status_service_finished">
<item quantity="one">Torrent is finished</item>
<item quantity="other">%1$s torrents are finished</item>
</plurals>
<plurals name="status_service_addedfinished">
<item quantity="one">%1$s added, %2$s finished torrent</item>
<item quantity="other">%1$s added, %2$s finished torrents</item>
</plurals>
<string name="status_service_andothers">%1$s и др.</string>

<string name="labels_showall">Все метки</string>
Expand Down Expand Up @@ -174,25 +154,13 @@ along with Transdroid. If not, see <http://www.gnu.org/licenses/>.
<string name="search_openingdetails">Открытие данных %1$s</string>
<string name="search_barcodescannernotfound">Сканер штрих-кода не найден.Установить его с Play Store?</string>
<string name="search_filemanagernotfound">IO File Manager не найден. Установить из магазина Play Store?</string>
<plurals name="search_resutlsselected">
<item quantity="one">%1$d result selected</item>
<item quantity="other">%1$d results selected</item>
</plurals>

<string name="rss_feeds">Лента новостей</string>
<string name="rss_nosettings">У вас еще нет подписок RSS на Торренты.</string>
<string name="rss_noselection">Выберите RSS-канал, чтобы посмотреть новинки</string>
<string name="rss_empty">RSS-канал недоступен или он не содержит элементов</string>
<string name="rss_notloaded">Подождите, канал RSS загружается</string>
<string name="rss_error">К сожалению, этот канал RSS временно не доступен</string>
<plurals name="rss_itemsselected">
<item quantity="one">%1$d item selected</item>
<item quantity="other">%1$d items selected</item>
</plurals>
<plurals name="rss_service_new">
<item quantity="one">New RSS feed torrent available</item>
<item quantity="other">%1$s new RSS feed torrents</item>
</plurals>
<string name="rss_service_newfor">Новые торренты от %1$s</string>

<string name="widget_loading">Загрузка&#8230;</string>
Expand Down
50 changes: 0 additions & 50 deletions app/src/main/res/values-sl/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,54 +68,4 @@ along with Transdroid. If not, see <http://www.gnu.org/licenses/>.
<string name="action_visitwebsite">Pojdi na transdroid.org</string>
<string name="action_close">Zapri</string>

<plurals name="navigation_torrentsselected">
<item quantity="one">%1$d torrent selected</item>
<item quantity="other">%1$d torrents selected</item>
</plurals>
<plurals name="navigation_filesselected">
<item quantity="one">%1$d files selected</item>
<item quantity="other">%1$d files selected</item>
</plurals>

<plurals name="status_service_added">
<item quantity="one">New torrent added</item>
<item quantity="other">%1$s new torrents added</item>
</plurals>
<plurals name="status_service_finished">
<item quantity="one">Torrent is finished</item>
<item quantity="other">%1$s torrents are finished</item>
</plurals>
<plurals name="status_service_addedfinished">
<item quantity="one">%1$s added, %2$s finished torrent</item>
<item quantity="other">%1$s added, %2$s finished torrents</item>
</plurals>



<plurals name="search_resutlsselected">
<item quantity="one">%1$d result selected</item>
<item quantity="other">%1$d results selected</item>
</plurals>

<plurals name="rss_itemsselected">
<item quantity="one">%1$d item selected</item>
<item quantity="other">%1$d items selected</item>
</plurals>
<plurals name="rss_service_new">
<item quantity="one">New RSS feed torrent available</item>
<item quantity="other">%1$s new RSS feed torrents</item>
</plurals>













</resources>
Loading

0 comments on commit 164a2d2

Please sign in to comment.