Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'notification-preferences' into 'master'

Browse Source 
notification preferences

See merge request fdroid/fdroidclient!698
This commit is contained in:
Hans-Christoph Steiner 2018-06-25 20:44:09 +00:00
commit 407e545a24
7 changed files with 54 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/basic/res/xml/preferences.xml
View File

@ -144,6 +144,12 @@
android:summary="@string/keep_install_history_summary"
android:defaultValue="false"
android:dependency="expert"/>
<CheckBoxPreference
android:key="hideAllNotifications"
android:title="@string/hide_all_notifications"
android:summary="@string/hide_all_notifications_summary"
android:defaultValue="false"
android:dependency="expert"/>
<CheckBoxPreference
android:key="forceOldIndex"
android:title="@string/force_old_index"

4
app/src/main/java/org/fdroid/fdroid/NotificationHelper.java
View File

@ -162,7 +162,7 @@ class NotificationHelper {
return;
}
if (!notificationManager.areNotificationsEnabled()) {
if (!notificationManager.areNotificationsEnabled() || Preferences.get().hideAllNotifications()) {
return;
}
@ -193,7 +193,7 @@ class NotificationHelper {
}
private void createSummaryNotifications() {
if (!notificationManager.areNotificationsEnabled()) {
if (!notificationManager.areNotificationsEnabled() || Preferences.get().hideAllNotifications()) {
return;
}

9
app/src/main/java/org/fdroid/fdroid/Preferences.java
View File

@ -105,6 +105,7 @@ public final class Preferences implements SharedPreferences.OnSharedPreferenceCh
public static final String PREF_PANIC_EXIT = "pref_panic_exit";
public static final String PREF_PANIC_HIDE = "pref_panic_hide";
public static final String PREF_HIDE_ON_LONG_PRESS_SEARCH = "hideOnLongPressSearch";
public static final String PREF_HIDE_ALL_NOTIFICATIONS = "hideAllNotifications";
public static final int OVER_NETWORK_NEVER = 0;
public static final int OVER_NETWORK_ON_DEMAND = 1;
@ -489,6 +490,14 @@ public final class Preferences implements SharedPreferences.OnSharedPreferenceCh
return preferences.getBoolean(PREF_HIDE_ON_LONG_PRESS_SEARCH, IGNORED_B);
}
/**
* Preference for whitelabel builds that are meant to be entirely controlled
* by the server, without user interaction, e.g. "appliances".
*/
public boolean hideAllNotifications() {
return preferences.getBoolean(PREF_HIDE_ALL_NOTIFICATIONS, IGNORED_B);
}
/**
* This is cached as it is called several times inside app list adapters.
* Providing it here means the shared preferences file only needs to be

16
app/src/main/java/org/fdroid/fdroid/UpdateService.java
View File

@ -319,14 +319,14 @@ public class UpdateService extends JobIntentService {
} else {
notificationBuilder.setProgress(100, 0, true);
}
notificationManager.notify(NOTIFY_ID_UPDATING, notificationBuilder.build());
setNotification();
break;
case STATUS_ERROR_GLOBAL:
text = context.getString(R.string.global_error_updating_repos, message);
notificationBuilder.setContentText(text)
.setCategory(NotificationCompat.CATEGORY_ERROR)
.setSmallIcon(android.R.drawable.ic_dialog_alert);
notificationManager.notify(NOTIFY_ID_UPDATING, notificationBuilder.build());
setNotification();
Toast.makeText(context, text, Toast.LENGTH_LONG).show();
break;
case STATUS_ERROR_LOCAL:
@ -344,7 +344,7 @@ public class UpdateService extends JobIntentService {
notificationBuilder.setContentText(text)
.setCategory(NotificationCompat.CATEGORY_ERROR)
.setSmallIcon(android.R.drawable.ic_dialog_info);
notificationManager.notify(NOTIFY_ID_UPDATING, notificationBuilder.build());
setNotification();
Toast.makeText(context, text, Toast.LENGTH_LONG).show();
break;
case STATUS_COMPLETE_WITH_CHANGES:
@ -353,12 +353,18 @@ public class UpdateService extends JobIntentService {
text = context.getString(R.string.repos_unchanged);
notificationBuilder.setContentText(text)
.setCategory(NotificationCompat.CATEGORY_SERVICE);
notificationManager.notify(NOTIFY_ID_UPDATING, notificationBuilder.build());
setNotification();
break;
}
}
};
private void setNotification() {
if (Preferences.get().isUpdateNotificationEnabled()) {
notificationManager.notify(NOTIFY_ID_UPDATING, notificationBuilder.build());
}
}
/**
* In order to send a {@link Toast} from a {@link IntentService}, we have to do these tricks.
*/
@ -404,7 +410,7 @@ public class UpdateService extends JobIntentService {
}
updating = true;
notificationManager.notify(NOTIFY_ID_UPDATING, notificationBuilder.build());
setNotification();
LocalBroadcastManager.getInstance(this).registerReceiver(updateStatusReceiver,
new IntentFilter(LOCAL_ACTION_STATUS));

20
app/src/main/java/org/fdroid/fdroid/views/fragments/PreferencesFragment.java
View File

@ -37,7 +37,9 @@ import android.support.v7.preference.EditTextPreference;
import android.support.v7.preference.ListPreference;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceCategory;
import android.support.v7.preference.PreferenceGroup;
import android.support.v7.preference.SeekBarPreference;
import android.support.v7.widget.RecyclerView;
import android.text.TextUtils;
import android.view.WindowManager;
import info.guardianproject.netcipher.NetCipher;
@ -91,6 +93,7 @@ public class PreferencesFragment extends PreferenceFragment
private static final int REQUEST_INSTALL_ORBOT = 0x1234;
private PreferenceGroup otherPrefGroup;
private LiveSeekBarPreference overWifiSeekBar;
private LiveSeekBarPreference overDataSeekBar;
private LiveSeekBarPreference updateIntervalSeekBar;
@ -109,6 +112,8 @@ public class PreferencesFragment extends PreferenceFragment
Preferences.get().migrateOldPreferences();
addPreferencesFromResource(R.xml.preferences);
otherPrefGroup = (PreferenceGroup) findPreference("pref_category_other");
useTorCheckPref = (SwitchPreference) findPreference(Preferences.PREF_USE_TOR);
enableProxyCheckPref = (SwitchPreference) findPreference(Preferences.PREF_ENABLE_PROXY);
updateAutoDownloadPref = findPreference(Preferences.PREF_AUTO_DOWNLOAD_INSTALL_UPDATES);
@ -284,6 +289,15 @@ public class PreferencesFragment extends PreferenceFragment
case Preferences.PREF_EXPERT:
checkSummary(key, R.string.expert_on);
boolean isExpertMode = Preferences.get().expertMode();
for (int i = 0; i < otherPrefGroup.getPreferenceCount(); i++) {
Preference pref = otherPrefGroup.getPreference(i);
if (TextUtils.equals(Preferences.PREF_EXPERT, pref.getDependency())) {
pref.setVisible(isExpertMode);
}
RecyclerView recyclerView = getListView();
recyclerView.smoothScrollToPosition(recyclerView.getAdapter().getItemCount() - 1);
}
break;
case Preferences.PREF_PRIVILEGED_INSTALLER:
@ -355,9 +369,8 @@ public class PreferencesFragment extends PreferenceFragment
// is no benefit showing it to them (it will only be disabled and we can't offer any
// way to easily install from here.
if (Build.VERSION.SDK_INT > 19 && !installed) {
PreferenceCategory other = (PreferenceCategory) findPreference("pref_category_other");
if (pref != null) {
other.removePreference(pref);
otherPrefGroup.removePreference(pref);
}
} else {
pref.setEnabled(installed);
@ -383,8 +396,7 @@ public class PreferencesFragment extends PreferenceFragment
private void initUpdatePrivilegedExtensionPreference() {
if (Build.VERSION.SDK_INT > 19) {
// this will never work on newer Android versions, so hide it
PreferenceCategory other = (PreferenceCategory) findPreference("pref_category_other");
other.removePreference(updatePrivilegedExtensionPref);
otherPrefGroup.removePreference(updatePrivilegedExtensionPref);
return;
}
updatePrivilegedExtensionPref.setPersistent(false);

4
app/src/main/res/values/strings.xml
View File

@ -16,6 +16,10 @@
<string name="updates">Updates</string>
<string name="unstable_updates">Unstable updates</string>
<string name="unstable_updates_summary">Suggest updates to unstable versions</string>
<string name="hide_all_notifications">Hide all notifications</string>
<string name="hide_all_notifications_summary">Prevent all actions from showing in the status bar and notification
drawer.
</string>
<string name="keep_install_history">Keep install history</string>
<string name="keep_install_history_summary">Store a log of all installs and uninstalls in a private store</string>
<string name="force_old_index">Force old index format</string>

6
app/src/main/res/xml/preferences.xml
View File

@ -165,6 +165,12 @@
android:summary="@string/keep_install_history_summary"
android:defaultValue="false"
android:dependency="expert"/>
<CheckBoxPreference
android:key="hideAllNotifications"
android:title="@string/hide_all_notifications"
android:summary="@string/hide_all_notifications_summary"
android:defaultValue="false"
android:dependency="expert"/>
<CheckBoxPreference
android:key="forceOldIndex"
android:title="@string/force_old_index"