diff --git a/app/build.gradle b/app/build.gradle index 0fce45bb..b9f0be42 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,7 +10,7 @@ android { minSdkVersion 15 targetSdkVersion 19 versionCode 216 - versionName '2.3.0' + versionName '2.3.0-beta' } signingConfigs { release { diff --git a/app/src/main/java/org/transdroid/core/service/AppUpdateService.java b/app/src/main/java/org/transdroid/core/service/AppUpdateService.java index 76a78e04..3225812b 100644 --- a/app/src/main/java/org/transdroid/core/service/AppUpdateService.java +++ b/app/src/main/java/org/transdroid/core/service/AppUpdateService.java @@ -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) diff --git a/app/src/main/java/org/transdroid/daemon/Torrent.java b/app/src/main/java/org/transdroid/daemon/Torrent.java index 3d0c51fa..446b9022 100644 --- a/app/src/main/java/org/transdroid/daemon/Torrent.java +++ b/app/src/main/java/org/transdroid/daemon/Torrent.java @@ -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 diff --git a/app/src/main/java/org/transdroid/daemon/util/TlsSniSocketFactory.java b/app/src/main/java/org/transdroid/daemon/util/TlsSniSocketFactory.java index cafb45ed..140f204a 100644 --- a/app/src/main/java/org/transdroid/daemon/util/TlsSniSocketFactory.java +++ b/app/src/main/java/org/transdroid/daemon/util/TlsSniSocketFactory.java @@ -16,6 +16,7 @@ */ package org.transdroid.daemon.util; +import android.annotation.TargetApi; import android.net.SSLCertificateSocketFactory; import android.os.Build; @@ -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 diff --git a/app/src/main/res/layout/dialog_color_picker.xml b/app/src/main/res/layout/dialog_color_picker.xml index 00ee3753..2ddbca41 100644 --- a/app/src/main/res/layout/dialog_color_picker.xml +++ b/app/src/main/res/layout/dialog_color_picker.xml @@ -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" /> @@ -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"> . Odesílání Aktivní Neaktivní - -%1$d torrent selected -%1$d torrents selected - - -%1$d files selected -%1$d files selected - Vybrat vše Vybrat dokončené Obrátit výběr @@ -124,18 +116,6 @@ along with Transdroid. If not, see . kB/s Reset Obnovit - -New torrent added -%1$s new torrents added - - -Torrent is finished -%1$s torrents are finished - - -%1$s added, %2$s finished torrent -%1$s added, %2$s finished torrents - %1$s a jiné Všechny štítky @@ -177,10 +157,6 @@ along with Transdroid. If not, see . Otevírání detailů pro %1$s Barcode Scanner není nainstalován. Chtete otevřít Google Play? Nebyl nalezen kompatibilní správce souborů. Chcete nainstalovat IO File Manager z Google Play? - -%1$d result selected -%1$d results selected - RSS kanál 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. @@ -188,14 +164,6 @@ along with Transdroid. If not, see . RSS kanál nyní není dostupný nebo je prázdný Prosím počkejte, dokud se RSS kanál nenačte Promiňte, tento RSS kanál nejde načíst v tuto chvíli - -%1$d item selected -%1$d items selected - - -New RSS feed torrent available -%1$s new RSS feed torrents - Nový torrent pro %1$s Načítání… diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 2dec9e0e..3ef05e54 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -79,14 +79,6 @@ along with Transdroid. If not, see . Envoi Actif Inactif - -%1$d torrent selected -%1$d torrents selected - - -%1$d files selected -%1$d files selected - Sélectionner tout Sélectionner les terminés Inverser la sélection @@ -123,18 +115,6 @@ along with Transdroid. If not, see . KB/S Réinitialiser Mise à jour - -New torrent added -%1$s new torrents added - - -Torrent is finished -%1$s torrents are finished - - -%1$s added, %2$s finished torrent -%1$s added, %2$s finished torrents - %1$s et autres Toutes les étiquettes @@ -176,10 +156,6 @@ along with Transdroid. If not, see . Ouverture des détails pour %1$s Le scanner de code-barres n\'a pas pu être trouvé. Voulez-vous l\'installer depuis le Play Store ? Aucun gestionnaire de fichiers compatible trouvé. Voulez-vous installer IO Gestionnaire de fichiers depuis le Play Store ? - -%1$d result selected -%1$d results selected - Flux RSS 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. @@ -187,14 +163,6 @@ along with Transdroid. If not, see . Le flux RSS n\'est pas disponible ou il ne contient aucun élément Désolé, veuillez attendre que le flux RSS soit chargé Désolé, ce flux RSS ne peut être chargé pour le moment - -%1$d item selected -%1$d items selected - - -New RSS feed torrent available -%1$s new RSS feed torrents - Nouveaux torrents de %1$s Chargement… diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 9e9f51dc..b6985b74 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -104,8 +104,8 @@ along with Transdroid. If not, see . DI %1$s ETA SCONOSCIUTO RATIO %1$s -%1$s DI %2$ SEEDER -%1$s DI %2$ LEECHER +%1$s DI %2$s SEEDER +%1$s DI %2$s LEECHER In download In invio In pausa diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 399d4fb5..99cb11dd 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -78,14 +78,6 @@ along with Transdroid. If not, see . 업로드 활성 비활성 - -%1$d torrent selected -%1$d torrents selected - - -%1$d files selected -%1$d files selected - 모두 선택 완료 항목 선택 선택 영역 반전 @@ -124,18 +116,6 @@ along with Transdroid. If not, see . KB/S 초기화 업데이트 - -New torrent added -%1$s new torrents added - - -Torrent is finished -%1$s torrents are finished - - -%1$s added, %2$s finished torrent -%1$s added, %2$s finished torrents - %1$s 등 모든 라벨 @@ -177,11 +157,6 @@ along with Transdroid. If not, see . %1$s 세부 정보 여는 중 바코드 스캐너 앱을 찾을 수 없습니다. Play 스토어에서 설치하시겠습니까? 호환되는 파일 관리자를 찾을 수 없습니다. Play 스토어에서 IO File Manager를 설치하시겠습니까? - -%1$d result selected -%1$d results selected - - RSS 피드 새 항목을 보려면 RSS 피드를 선택하세요 RSS 피드를 사용할 수 없거나, 피드에 포함된 항목이 없습니다 diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index ca5e8596..d8cdef23 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -77,14 +77,6 @@ along with Transdroid. If not, see . Раздающиеся Активные Неактивные - -%1$d torrent selected -%1$d torrents selected - - -%1$d files selected -%1$d files selected - Выбрать все Выбрать завершенные Инвертировать отмеч. @@ -122,18 +114,6 @@ along with Transdroid. If not, see . KB/S Сброс Обнов. - -New torrent added -%1$s new torrents added - - -Torrent is finished -%1$s torrents are finished - - -%1$s added, %2$s finished torrent -%1$s added, %2$s finished torrents - %1$s и др. Все метки @@ -174,10 +154,6 @@ along with Transdroid. If not, see . Открытие данных %1$s Сканер штрих-кода не найден.Установить его с Play Store? IO File Manager не найден. Установить из магазина Play Store? - -%1$d result selected -%1$d results selected - Лента новостей У вас еще нет подписок RSS на Торренты. @@ -185,14 +161,6 @@ along with Transdroid. If not, see . RSS-канал недоступен или он не содержит элементов Подождите, канал RSS загружается К сожалению, этот канал RSS временно не доступен - -%1$d item selected -%1$d items selected - - -New RSS feed torrent available -%1$s new RSS feed torrents - Новые торренты от %1$s Загрузка… diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml index 3b582651..348eddd2 100644 --- a/app/src/main/res/values-sl/strings.xml +++ b/app/src/main/res/values-sl/strings.xml @@ -68,54 +68,4 @@ along with Transdroid. If not, see . Pojdi na transdroid.org Zapri - -%1$d torrent selected -%1$d torrents selected - - -%1$d files selected -%1$d files selected - - - -New torrent added -%1$s new torrents added - - -Torrent is finished -%1$s torrents are finished - - -%1$s added, %2$s finished torrent -%1$s added, %2$s finished torrents - - - - - -%1$d result selected -%1$d results selected - - - -%1$d item selected -%1$d items selected - - -New RSS feed torrent available -%1$s new RSS feed torrents - - - - - - - - - - - - - - diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index a4209665..6195d97a 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -70,14 +70,6 @@ along with Transdroid. If not, see . Роздаються Активні Неактивні - -%1$d torrent selected -%1$d torrents selected - - -%1$d files selected -%1$d files selected - Вибрати все Інвертувати вибір @@ -114,18 +106,6 @@ along with Transdroid. If not, see . кб/с Скинути Оновити - -New torrent added -%1$s new torrents added - - -Torrent is finished -%1$s torrents are finished - - -%1$s added, %2$s finished torrent -%1$s added, %2$s finished torrents - %1$s та інш. Всі мітки @@ -138,24 +118,6 @@ along with Transdroid. If not, see . Напр. фільми чи лінукс - -%1$d result selected -%1$d results selected - - - -%1$d item selected -%1$d items selected - - -New RSS feed torrent available -%1$s new RSS feed torrents - - - - - - Таймаут має бути не порожнім та білше нуля