Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-11-22 22:32:06 +01:00
Code Issues Releases Wiki Activity

Merge pull request #173 from iachimoe/4.2

Browse source 
Updated comments to indicate that reject_all is default SubscriptionMode
This commit is contained in:
Florian Schmaus 2017-08-26 19:50:49 +02:00 committed by GitHub
commit 1d943aed20
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
smack-im/src/main/java/org/jivesoftware/smack/roster/Roster.java
View file

@ -213,7 +213,7 @@ public final class Roster extends Manager {
* Returns the default subscription processing mode to use when a new Roster is created. The * Returns the default subscription processing mode to use when a new Roster is created. The
* subscription processing mode dictates what action Smack will take when subscription * subscription processing mode dictates what action Smack will take when subscription
* requests from other users are made. The default subscription mode * requests from other users are made. The default subscription mode
* is {@link SubscriptionMode#accept_all}. * is {@link SubscriptionMode#reject_all}.
* *
* @return the default subscription mode to use for new Rosters * @return the default subscription mode to use for new Rosters
*/ */
@ -225,7 +225,7 @@ public final class Roster extends Manager {
* Sets the default subscription processing mode to use when a new Roster is created. The * Sets the default subscription processing mode to use when a new Roster is created. The
* subscription processing mode dictates what action Smack will take when subscription * subscription processing mode dictates what action Smack will take when subscription
* requests from other users are made. The default subscription mode * requests from other users are made. The default subscription mode
* is {@link SubscriptionMode#accept_all}. * is {@link SubscriptionMode#reject_all}.
* *
* @param subscriptionMode the default subscription mode to use for new Rosters. * @param subscriptionMode the default subscription mode to use for new Rosters.
*/ */
@ -383,7 +383,7 @@ public final class Roster extends Manager {
/** /**
* Returns the subscription processing mode, which dictates what action * Returns the subscription processing mode, which dictates what action
* Smack will take when subscription requests from other users are made. * Smack will take when subscription requests from other users are made.
* The default subscription mode is {@link SubscriptionMode#accept_all}. * The default subscription mode is {@link SubscriptionMode#reject_all}.
* <p> * <p>
* If using the manual mode, a PacketListener should be registered that * If using the manual mode, a PacketListener should be registered that
* listens for Presence packets that have a type of * listens for Presence packets that have a type of
@ -399,7 +399,7 @@ public final class Roster extends Manager {
/** /**
* Sets the subscription processing mode, which dictates what action * Sets the subscription processing mode, which dictates what action
* Smack will take when subscription requests from other users are made. * Smack will take when subscription requests from other users are made.
* The default subscription mode is {@link SubscriptionMode#accept_all}. * The default subscription mode is {@link SubscriptionMode#reject_all}.
* <p> * <p>
* If using the manual mode, a PacketListener should be registered that * If using the manual mode, a PacketListener should be registered that
* listens for Presence packets that have a type of * listens for Presence packets that have a type of
@ -1402,14 +1402,14 @@ public final class Roster extends Manager {
public enum SubscriptionMode { public enum SubscriptionMode {
/** /**
* Automatically accept all subscription and unsubscription requests. This is * Automatically accept all subscription and unsubscription requests.
* the default mode and is suitable for simple client. More complex client will * This is suitable for simple clients. More complex clients will
* likely wish to handle subscription requests manually. * likely wish to handle subscription requests manually.
*/ */
accept_all, accept_all,
/** /**
* Automatically reject all subscription requests. * Automatically reject all subscription requests. This is the default mode.
*/ */
reject_all, reject_all,