Merge branch 'working' into 'develop'
some changes See merge request tom79/fedilab!530
This commit is contained in:
commit
95e52470f5
|
@ -3081,8 +3081,7 @@ public class API {
|
|||
if( notificationId == null)
|
||||
action = "/notifications/clear";
|
||||
else {
|
||||
params.put("id",notificationId);
|
||||
action = "/notifications/dismiss";
|
||||
action = "/notifications/" + notificationId + "/dismiss";
|
||||
}
|
||||
try {
|
||||
new HttpsConnection(context, this.instance).post(getAbsoluteUrl(action), 10, params, prefKeyOauthTokenT);
|
||||
|
|
|
@ -311,6 +311,8 @@ public class ContentSettingsFragment extends Fragment implements ScreenShotable
|
|||
editor.apply();
|
||||
}
|
||||
});
|
||||
final LinearLayout set_auto_backup_text = rootView.findViewById(R.id.set_auto_backup_text);
|
||||
set_auto_backup_text.setOnClickListener(view -> set_auto_backup.performClick());
|
||||
|
||||
|
||||
TagsEditText set_featured_tags = rootView.findViewById(R.id.set_featured_tags);
|
||||
|
|
|
@ -964,6 +964,7 @@
|
|||
android:textSize="16sp"
|
||||
android:layout_height="wrap_content" />
|
||||
<LinearLayout
|
||||
android:id="@+id/set_auto_backup_text"
|
||||
android:layout_width="0dp"
|
||||
android:layout_weight="1"
|
||||
android:layout_height="wrap_content"
|
||||
|
|
Loading…
Reference in New Issue