| 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 android.app.Activity; | 20 import android.app.Activity; | 
| 21 import android.os.Bundle; | 21 import android.os.Bundle; | 
| 22 import android.preference.ListPreference; | 22 import android.preference.ListPreference; | 
| 23 import android.preference.MultiSelectListPreference; | 23 import android.preference.MultiSelectListPreference; | 
| 24 import android.preference.Preference; | 24 import android.preference.Preference; | 
| 25 import android.preference.SwitchPreference; | 25 import android.preference.SwitchPreference; | 
| 26 import android.util.Log; | 26 import android.util.Log; | 
| 27 | 27 | 
|  | 28 import org.adblockplus.libadblockplus.android.ConnectionType; | 
| 28 import org.adblockplus.libadblockplus.android.Subscription; | 29 import org.adblockplus.libadblockplus.android.Subscription; | 
| 29 | 30 | 
| 30 import java.util.HashSet; | 31 import java.util.HashSet; | 
| 31 import java.util.LinkedList; | 32 import java.util.LinkedList; | 
| 32 import java.util.List; | 33 import java.util.List; | 
| 33 import java.util.Set; | 34 import java.util.Set; | 
| 34 | 35 | 
| 35 /** | 36 /** | 
| 36  * General Adblock settings fragment. | 37  * General Adblock settings fragment. | 
| 37  * Use the {@link GeneralSettingsFragment#newInstance} factory method to | 38  * Use the {@link GeneralSettingsFragment#newInstance} factory method to | 
| (...skipping 282 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 320     } | 321     } | 
| 321     else | 322     else | 
| 322     { | 323     { | 
| 323       // should not be invoked as only 'wl' preference is subscribed for callbac
     k | 324       // should not be invoked as only 'wl' preference is subscribed for callbac
     k | 
| 324       return false; | 325       return false; | 
| 325     } | 326     } | 
| 326 | 327 | 
| 327     return true; | 328     return true; | 
| 328   } | 329   } | 
| 329 } | 330 } | 
| OLD | NEW | 
|---|