| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  * This file is part of Adblock Plus <https://adblockplus.org/>, | 2  * This file is part of Adblock Plus <https://adblockplus.org/>, | 
| 3  * Copyright (C) 2006-present eyeo GmbH | 3  * Copyright (C) 2006-present eyeo GmbH | 
| 4  * | 4  * | 
| 5  * Adblock Plus is free software: you can redistribute it and/or modify | 5  * Adblock Plus is free software: you can redistribute it and/or modify | 
| 6  * it under the terms of the GNU General Public License version 3 as | 6  * it under the terms of the GNU General Public License version 3 as | 
| 7  * published by the Free Software Foundation. | 7  * published by the Free Software Foundation. | 
| 8  * | 8  * | 
| 9  * Adblock Plus is distributed in the hope that it will be useful, | 9  * Adblock Plus is distributed in the hope that it will be useful, | 
| 10  * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10  * but WITHOUT ANY WARRANTY; without even the implied warranty of | 
| 11  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the | 11  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the | 
| 12  * GNU General Public License for more details. | 12  * GNU General Public License for more details. | 
| 13  * | 13  * | 
| 14  * You should have received a copy of the GNU General Public License | 14  * You should have received a copy of the GNU General Public License | 
| 15  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>. | 15  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>. | 
| 16  */ | 16  */ | 
| 17 | 17 | 
| 18 package org.adblockplus.libadblockplus.android.settings; | 18 package org.adblockplus.libadblockplus.android.settings; | 
| 19 | 19 | 
|  | 20 import org.adblockplus.libadblockplus.android.ConnectionType; | 
| 20 import org.adblockplus.libadblockplus.android.Subscription; | 21 import org.adblockplus.libadblockplus.android.Subscription; | 
| 21 | 22 | 
| 22 import java.io.Serializable; | 23 import java.io.Serializable; | 
| 23 import java.util.List; | 24 import java.util.List; | 
| 24 | 25 | 
| 25 /** | 26 /** | 
| 26  * Adblock settings | 27  * Adblock settings | 
| 27  */ | 28  */ | 
| 28 public class AdblockSettings implements Serializable | 29 public class AdblockSettings implements Serializable | 
| 29 { | 30 { | 
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 88   { | 89   { | 
| 89     return "AdblockSettings{" + | 90     return "AdblockSettings{" + | 
| 90       "adblockEnabled=" + adblockEnabled + | 91       "adblockEnabled=" + adblockEnabled + | 
| 91       ", acceptableAdsEnabled=" + acceptableAdsEnabled + | 92       ", acceptableAdsEnabled=" + acceptableAdsEnabled + | 
| 92       ", subscriptions:" + (subscriptions != null ? subscriptions.size() : 0) + | 93       ", subscriptions:" + (subscriptions != null ? subscriptions.size() : 0) + | 
| 93       ", whitelistedDomains:" + (whitelistedDomains != null ? whitelistedDomains
    .size() : 0) + | 94       ", whitelistedDomains:" + (whitelistedDomains != null ? whitelistedDomains
    .size() : 0) + | 
| 94       ", allowedConnectionType=" + (allowedConnectionType != null ? allowedConne
    ctionType.getValue() : "null") + | 95       ", allowedConnectionType=" + (allowedConnectionType != null ? allowedConne
    ctionType.getValue() : "null") + | 
| 95       '}'; | 96       '}'; | 
| 96   } | 97   } | 
| 97 } | 98 } | 
| OLD | NEW | 
|---|