Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
657e4fbf
Kaydet (Commit)
657e4fbf
authored
Eyl 03, 2012
tarafından
Andrzej J.R. Hunt
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Fix removal of stale servers in selector.
Change-Id: I95a378cade77a7e53ef6baa69a6e9223d13e1526
üst
cb6d2ed2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
6 deletions
+3
-6
SelectorActivity.java
...e/src/org/libreoffice/impressremote/SelectorActivity.java
+2
-5
ServerFinder.java
...libreoffice/impressremote/communication/ServerFinder.java
+1
-1
No files found.
android/sdremote/src/org/libreoffice/impressremote/SelectorActivity.java
Dosyayı görüntüle @
657e4fbf
...
@@ -220,8 +220,6 @@ public class SelectorActivity extends SherlockActivity {
...
@@ -220,8 +220,6 @@ public class SelectorActivity extends SherlockActivity {
// Bluetooth -- Remove old
// Bluetooth -- Remove old
for
(
Entry
<
Server
,
View
>
aEntry
:
mBluetoothServers
.
entrySet
())
{
for
(
Entry
<
Server
,
View
>
aEntry
:
mBluetoothServers
.
entrySet
())
{
if
(!
Arrays
.
asList
(
aServers
).
contains
(
aEntry
.
getKey
()))
{
if
(!
Arrays
.
asList
(
aServers
).
contains
(
aEntry
.
getKey
()))
{
System
.
out
.
println
(
"Removing view "
+
aEntry
.
getKey
().
getName
());
mBluetoothServers
.
remove
(
aEntry
.
getKey
());
mBluetoothServers
.
remove
(
aEntry
.
getKey
());
mBluetoothList
.
removeView
((
View
)
aEntry
.
getValue
()
mBluetoothList
.
removeView
((
View
)
aEntry
.
getValue
()
.
getParent
());
.
getParent
());
...
@@ -230,8 +228,7 @@ public class SelectorActivity extends SherlockActivity {
...
@@ -230,8 +228,7 @@ public class SelectorActivity extends SherlockActivity {
// Network -- Remove old
// Network -- Remove old
for
(
Entry
<
Server
,
View
>
aEntry
:
mNetworkServers
.
entrySet
())
{
for
(
Entry
<
Server
,
View
>
aEntry
:
mNetworkServers
.
entrySet
())
{
if
(!
Arrays
.
asList
(
aServers
).
contains
(
aEntry
.
getKey
()))
{
if
(!
Arrays
.
asList
(
aServers
).
contains
(
aEntry
.
getKey
()))
{
System
.
out
.
println
(
"Removing view"
);
mNetworkServers
.
remove
(
aEntry
.
getKey
());
mNetworkServers
.
remove
(
aEntry
.
getKey
().
getName
());
mNetworkList
.
removeView
((
View
)
aEntry
.
getValue
()
mNetworkList
.
removeView
((
View
)
aEntry
.
getValue
()
.
getParent
());
.
getParent
());
}
}
...
@@ -262,8 +259,8 @@ public class SelectorActivity extends SherlockActivity {
...
@@ -262,8 +259,8 @@ public class SelectorActivity extends SherlockActivity {
}
}
}
}
// Hide as necessary
// Hide as necessary
mBluetoothContainer
mBluetoothContainer
.
setVisibility
((
mBluetoothServers
.
size
()
!=
0
)
?
View
.
VISIBLE
.
setVisibility
((
mBluetoothServers
.
size
()
!=
0
)
?
View
.
VISIBLE
:
View
.
GONE
);
:
View
.
GONE
);
...
...
android/sdremote/src/org/libreoffice/impressremote/communication/ServerFinder.java
Dosyayı görüntüle @
657e4fbf
...
@@ -24,7 +24,7 @@ public class ServerFinder {
...
@@ -24,7 +24,7 @@ public class ServerFinder {
private
static
final
String
CHARSET
=
"UTF-8"
;
private
static
final
String
CHARSET
=
"UTF-8"
;
private
static
final
long
SEARCH_INTERVAL
=
1000
*
20
;
private
static
final
long
SEARCH_INTERVAL
=
1000
*
15
;
private
DatagramSocket
mSocket
=
null
;
private
DatagramSocket
mSocket
=
null
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment