⚡ Sangsakala Proxy 🏠 Home
Skip to content

Commit c25612f

Browse files
github-actions[bot]github-actions[bot]
committed
Merge branch 'hotfix/5.295.2'
2 parents 2c7a5be + 245a9c5 commit c25612f

17 files changed

Lines changed: 20 additions & 427 deletions

‎.maestro/autofill/3_autofill_prompted_to_save_creds_on_form.yaml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,20 +28,27 @@ tags:
2828

2929
- tapOn:
3030
id: "username"
31-
3231
- inputText: "user"
32+
- pressKey: Back
33+
3334
- tapOn:
3435
id: "password"
3536
- inputText: "password1"
37+
- pressKey: Back
38+
3639
- tapOn:
3740
text: "Login"
3841
- assertVisible: "Save Password"
3942
- tapOn: "Save Password"
43+
4044
- pressKey: back
4145
- tapOn: "Close Autofill Dialog"
46+
4247
- tapOn:
4348
id: "password"
4449
- inputText: "password2"
50+
- pressKey: Back
51+
4552
- tapOn:
4653
text: "Login"
4754
- assertVisible: "Update Password"

‎app/src/main/AndroidManifest.xml‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -564,9 +564,6 @@
564564
<meta-data
565565
android:name="android.appwidget.provider"
566566
android:resource="@xml/search_widget_info" />
567-
<meta-data
568-
android:name="com.duckduckgo.widget.legacy_provider_info"
569-
android:resource="@xml/search_widget_info_legacy" />
570567
</receiver>
571568

572569
<receiver
@@ -579,9 +576,6 @@
579576
<meta-data
580577
android:name="android.appwidget.provider"
581578
android:resource="@xml/search_widget_info_light" />
582-
<meta-data
583-
android:name="com.duckduckgo.widget.legacy_provider_info"
584-
android:resource="@xml/search_widget_info_legacy_light" />
585579
</receiver>
586580

587581
<receiver
@@ -594,9 +588,6 @@
594588
<meta-data
595589
android:name="android.appwidget.provider"
596590
android:resource="@xml/search_only_widget_info" />
597-
<meta-data
598-
android:name="com.duckduckgo.widget.legacy_provider_info"
599-
android:resource="@xml/search_only_widget_info_legacy" />
600591
</receiver>
601592

602593
<receiver
@@ -609,9 +600,6 @@
609600
<meta-data
610601
android:name="android.appwidget.provider"
611602
android:resource="@xml/search_favorites_widget_info" />
612-
<meta-data
613-
android:name="com.duckduckgo.widget.legacy_provider_info"
614-
android:resource="@xml/search_favorites_widget_info_legacy" />
615603
</receiver>
616604

617605
<receiver

‎app/src/main/java/com/duckduckgo/app/widget/AddWidgetLauncher.kt‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import android.annotation.SuppressLint
2020
import android.app.Activity
2121
import android.app.ActivityOptions
2222
import android.app.PendingIntent
23+
import android.appwidget.AppWidgetManager
2324
import android.content.ComponentName
2425
import android.content.Context
2526
import android.content.Intent
@@ -32,7 +33,6 @@ import com.duckduckgo.widget.SearchAndFavoritesWidget
3233
import com.duckduckgo.widget.SearchOnlyWidget
3334
import com.duckduckgo.widget.SearchWidget
3435
import com.duckduckgo.widget.SearchWidgetLight
35-
import com.duckduckgo.widget.SearchWidgetProviderInfoUpdater
3636
import com.squareup.anvil.annotations.ContributesBinding
3737
import javax.inject.Inject
3838
import javax.inject.Named
@@ -85,7 +85,6 @@ class AddWidgetCompatLauncher @Inject constructor(
8585
@Named("appWidgetManagerAddWidgetLauncher")
8686
class AppWidgetManagerAddWidgetLauncher @Inject constructor(
8787
private val appTheme: AppTheme,
88-
private val searchWidgetProviderInfoUpdater: SearchWidgetProviderInfoUpdater,
8988
) : AddWidgetLauncher {
9089
companion object {
9190
const val ACTION_ADD_WIDGET = "actionWidgetAdded"
@@ -122,7 +121,7 @@ class AppWidgetManagerAddWidgetLauncher @Inject constructor(
122121
ComponentName(it, SearchAndFavoritesWidget::class.java)
123122
}
124123
}
125-
searchWidgetProviderInfoUpdater.syncAndRequestPinAppWidget(provider, buildPendingIntent(it, widgetLabel, source))
124+
AppWidgetManager.getInstance(it).requestPinAppWidget(provider, null, buildPendingIntent(it, widgetLabel, source))
126125
}
127126
}
128127

‎app/src/main/java/com/duckduckgo/widget/SearchWidgetProviderInfoUpdater.kt‎

Lines changed: 0 additions & 86 deletions
This file was deleted.

‎app/src/main/java/com/duckduckgo/widget/WidgetPrivacyConfigUpdateListener.kt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ import javax.inject.Inject
3636
class WidgetPrivacyConfigUpdateListener @Inject constructor(
3737
private val context: Context,
3838
private val widgetUpdater: WidgetUpdater,
39-
private val searchWidgetProviderInfoUpdater: SearchWidgetProviderInfoUpdater,
4039
private val appBrandDesignUpdateToggles: AppBrandDesignUpdateToggles,
4140
) : PrivacyConfigCallbackPlugin, MainProcessLifecycleObserver {
4241

@@ -54,7 +53,6 @@ class WidgetPrivacyConfigUpdateListener @Inject constructor(
5453
}
5554

5655
private fun refreshWidgets(isAddressBarEnabled: Boolean) {
57-
searchWidgetProviderInfoUpdater.sync()
5856
widgetUpdater.updateWidgets(context)
5957
lastAppliedAddressBarEnabled = isAddressBarEnabled
6058
}

‎app/src/main/res/xml-w600dp/search_favorites_widget_info.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
android:configure="com.duckduckgo.app.WidgetThemeConfiguration"
2626
android:minResizeWidth="110dp"
2727
android:minResizeHeight="110dp"
28-
android:previewImage="@drawable/image_preview_search_favorites_widget_daynight"
28+
android:previewImage="@drawable/image_preview_search_favorites_widget_legacy_daynight"
2929
android:description="@string/searchAndFavoritesWidgetDescription"
3030
android:resizeMode="vertical|horizontal"
3131
android:updatePeriodMillis="86400000"

‎app/src/main/res/xml/search_favorites_widget_info.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
android:configure="com.duckduckgo.app.WidgetThemeConfiguration"
2626
android:minResizeWidth="110dp"
2727
android:minResizeHeight="110dp"
28-
android:previewImage="@drawable/image_preview_search_favorites_widget_daynight"
28+
android:previewImage="@drawable/image_preview_search_favorites_widget_legacy_daynight"
2929
android:description="@string/searchAndFavoritesWidgetDescription"
3030
android:resizeMode="horizontal|vertical"
3131
android:updatePeriodMillis="86400000"

‎app/src/main/res/xml/search_favorites_widget_info_legacy.xml‎

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎app/src/main/res/xml/search_only_widget_info.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
android:minWidth="348dp"
2424
android:minHeight="40dp"
2525
android:minResizeWidth="110dp"
26-
android:previewImage="@drawable/image_preview_search_only_widget_daynight"
26+
android:previewImage="@drawable/image_preview_search_only_widget_legacy_daynight"
2727
android:resizeMode="horizontal"
2828
android:description="@string/searchOnlyWidgetDescription"
2929
android:updatePeriodMillis="86400000"

‎app/src/main/res/xml/search_only_widget_info_legacy.xml‎

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)