Skip to content

Commit

Permalink
fix issue in home widget
Browse files Browse the repository at this point in the history
  • Loading branch information
@frankmer
frankmer committed Oct 7, 2024
1 parent 1170b0c commit 38841f4
Show file tree
Hide file tree
Showing 4 changed files with 67 additions and 45 deletions.
53 changes: 32 additions & 21 deletions android/app/src/netknights/kotlin/it/netknights/piauthenticator/WidgetProvider.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class AppWidgetProvider : HomeWidgetProvider() {
nightModeSuffix = if(currentThemeMode == "dark") "_dark" else "_light"
}
println("nightModeSuffix: $nightModeSuffix")

var editor = widgetData.edit()
editor.putString("_widgetIds", appWidgetIds.joinToString(","))
widgetData.getString("_copyText", null)?.let {
Expand All @@ -46,7 +46,7 @@ class AppWidgetProvider : HomeWidgetProvider() {
editor.remove("_rebuildingWidgetIds")
var rebuildingWidgetIds: IntArray
if(rebuildingIds == null || rebuildingIds.isEmpty()) {
rebuildingWidgetIds = appWidgetIds
rebuildingWidgetIds = appWidgetIds
} else {
rebuildingWidgetIds = rebuildingIds?.split(",")?.map { it.toInt() }?.toIntArray() ?: intArrayOf()
}
Expand All @@ -55,7 +55,7 @@ class AppWidgetProvider : HomeWidgetProvider() {
rebuildingWidgetIds.forEach { widgetId ->
val views = RemoteViews(context.packageName, R.layout.widget_layout).apply {
val tokenId = widgetData.getString("_tokenId$widgetId", null)

// _loadImageFromWidgetDataString(widgetData, "_tokenBackground$nightModeSuffix", R.id.widget_background, this)
_setBackground(context, widgetData, widgetId, nightModeSuffix, this)
if(tokenId == null) {
Expand Down Expand Up @@ -93,10 +93,12 @@ class AppWidgetProvider : HomeWidgetProvider() {
}
fun _setSettingsIcon(context: Context, widgetData: SharedPreferences, widgetId: Int, nightModeSuffix: String, remoteViews: RemoteViews) {
_loadImageFromWidgetDataString(widgetData, "_settingsIcon$nightModeSuffix", R.id.widget_settings, remoteViews)
val pendingIntent = HomeWidgetLaunchIntent.getActivity(context,
val pendingIntent = HomeWidgetLaunchIntent.getActivity(
context,
MainActivity::class.java,
Uri.parse("homewidgetnavigate://link?id=$widgetId"))
remoteViews.setOnClickPendingIntent(R.id.widget_settings, pendingIntent)
Uri.parse("homewidgetnavigate://link?id=$widgetId")
)
remoteViews.setOnClickPendingIntent(R.id.widget_settings, pendingIntent)
}
fun _setActionIcon(context: Context, widgetData: SharedPreferences, widgetId: Int, nightModeSuffix: String, remoteViews: RemoteViews, showToken: Boolean) {
println("getString: _tokenType$widgetId")
Expand All @@ -120,21 +122,27 @@ class AppWidgetProvider : HomeWidgetProvider() {
_loadImageFromWidgetDataString(widgetData, "_tokenOtp${widgetId}_hidden$nightModeSuffix", R.id.widget_otp, remoteViews)
println("tokenLocked: $tokenLocked")
if(tokenLocked) {
val pendingIntent = HomeWidgetLaunchIntent.getActivity(context,
val pendingIntent = HomeWidgetLaunchIntent.getActivity(
context,
MainActivity::class.java,
Uri.parse("homewidgetnavigate://showlocked?id=$widgetId"))
Uri.parse("homewidgetnavigate://showlocked?id=$widgetId")
)
remoteViews.setOnClickPendingIntent(R.id.widget_otp, pendingIntent)
} else {
val backgroundIntent = HomeWidgetBackgroundIntent.getBroadcast(context,
Uri.parse("homewidget://show?widgetId=$widgetId"))
val backgroundIntent = HomeWidgetBackgroundIntent.getBroadcast(
context,
Uri.parse("homewidget://show?widgetId=$widgetId")
)
remoteViews.setOnClickPendingIntent(R.id.widget_otp, backgroundIntent)}
}

fun _setTokenOtp(context: Context, widgetData: SharedPreferences, widgetId: Int, nightModeSuffix: String, remoteViews: RemoteViews) {
_loadImageFromWidgetDataString(widgetData, "_tokenOtp$widgetId$nightModeSuffix", R.id.widget_otp, remoteViews)
// Otp is visible, so the user can copy it to the clipboard with the next click
val clipIntent = HomeWidgetBackgroundIntent.getBroadcast(context,
Uri.parse("homewidget://copy?widgetId=$widgetId"))
val clipIntent = HomeWidgetBackgroundIntent.getBroadcast(
context,
Uri.parse("homewidget://copy?widgetId=$widgetId")
)
remoteViews.setOnClickPendingIntent(R.id.widget_otp, clipIntent)
}

Expand All @@ -145,35 +153,38 @@ class AppWidgetProvider : HomeWidgetProvider() {
}

fun _setContainerEmpty(context: Context, widgetData: SharedPreferences, widgetId: Int, nightModeSuffix: String, remoteViews: RemoteViews) {
// No token yet, so the user has to select one
val pendingIntent = HomeWidgetLaunchIntent.getActivity(
context,
MainActivity::class.java,
Uri.parse("homewidgetnavigate://link?id=$widgetId")
)
remoteViews.setOnClickPendingIntent(R.id.widget_background, pendingIntent)
remoteViews.setOnClickPendingIntent(R.id.widget_otp, pendingIntent)
_loadImageFromWidgetDataString(widgetData, "_tokenContainerEmpty$nightModeSuffix", R.id.widget_otp, remoteViews)
remoteViews.setImageViewBitmap(R.id.widget_settings, null);
remoteViews.setImageViewBitmap(R.id.widget_action, null);
// No token yet, so the user has to select one
val pendingIntent = HomeWidgetLaunchIntent.getActivity(context,
MainActivity::class.java,
Uri.parse("homewidgetnavigate://link?id=$widgetId"))
remoteViews.setOnClickPendingIntent(R.id.widget_background, pendingIntent)
}



fun _loadImageFromWidgetDataString(widgetData: SharedPreferences, key: String, xmlElement: Int, view: RemoteViews): Boolean {

println("Try to load image from key: $key")
val imagePath = widgetData.getString("$key", null)
if(imagePath == null) {
println("imagePath is null")
view.setImageViewBitmap(xmlElement, null)
return false
}
}

val imageFile = File(imagePath)
val imageExists = imageFile.exists()
if (imageExists && imageFile.absolutePath == null) {
println("image not found!, looked @: $imagePath")
return false
}

println("imagePath is $imagePath")
try {
val myBitmap: Bitmap = BitmapFactory.decodeFile(imageFile.absolutePath)
Expand Down
53 changes: 32 additions & 21 deletions ...oid/app/src/netknights_debug/kotlin/it/netknights/piauthenticator/debug/WidgetProvider.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class AppWidgetProvider : HomeWidgetProvider() {
nightModeSuffix = if(currentThemeMode == "dark") "_dark" else "_light"
}
println("nightModeSuffix: $nightModeSuffix")

var editor = widgetData.edit()
editor.putString("_widgetIds", appWidgetIds.joinToString(","))
widgetData.getString("_copyText", null)?.let {
Expand All @@ -46,7 +46,7 @@ class AppWidgetProvider : HomeWidgetProvider() {
editor.remove("_rebuildingWidgetIds")
var rebuildingWidgetIds: IntArray
if(rebuildingIds == null || rebuildingIds.isEmpty()) {
rebuildingWidgetIds = appWidgetIds
rebuildingWidgetIds = appWidgetIds
} else {
rebuildingWidgetIds = rebuildingIds?.split(",")?.map { it.toInt() }?.toIntArray() ?: intArrayOf()
}
Expand All @@ -55,7 +55,7 @@ class AppWidgetProvider : HomeWidgetProvider() {
rebuildingWidgetIds.forEach { widgetId ->
val views = RemoteViews(context.packageName, R.layout.widget_layout).apply {
val tokenId = widgetData.getString("_tokenId$widgetId", null)

// _loadImageFromWidgetDataString(widgetData, "_tokenBackground$nightModeSuffix", R.id.widget_background, this)
_setBackground(context, widgetData, widgetId, nightModeSuffix, this)
if(tokenId == null) {
Expand Down Expand Up @@ -93,10 +93,12 @@ class AppWidgetProvider : HomeWidgetProvider() {
}
fun _setSettingsIcon(context: Context, widgetData: SharedPreferences, widgetId: Int, nightModeSuffix: String, remoteViews: RemoteViews) {
_loadImageFromWidgetDataString(widgetData, "_settingsIcon$nightModeSuffix", R.id.widget_settings, remoteViews)
val pendingIntent = HomeWidgetLaunchIntent.getActivity(context,
val pendingIntent = HomeWidgetLaunchIntent.getActivity(
context,
MainActivity::class.java,
Uri.parse("homewidgetnavigate://link?id=$widgetId"))
remoteViews.setOnClickPendingIntent(R.id.widget_settings, pendingIntent)
Uri.parse("homewidgetnavigate://link?id=$widgetId")
)
remoteViews.setOnClickPendingIntent(R.id.widget_settings, pendingIntent)
}
fun _setActionIcon(context: Context, widgetData: SharedPreferences, widgetId: Int, nightModeSuffix: String, remoteViews: RemoteViews, showToken: Boolean) {
println("getString: _tokenType$widgetId")
Expand All @@ -120,21 +122,27 @@ class AppWidgetProvider : HomeWidgetProvider() {
_loadImageFromWidgetDataString(widgetData, "_tokenOtp${widgetId}_hidden$nightModeSuffix", R.id.widget_otp, remoteViews)
println("tokenLocked: $tokenLocked")
if(tokenLocked) {
val pendingIntent = HomeWidgetLaunchIntent.getActivity(context,
val pendingIntent = HomeWidgetLaunchIntent.getActivity(
context,
MainActivity::class.java,
Uri.parse("homewidgetnavigate://showlocked?id=$widgetId"))
Uri.parse("homewidgetnavigate://showlocked?id=$widgetId")
)
remoteViews.setOnClickPendingIntent(R.id.widget_otp, pendingIntent)
} else {
val backgroundIntent = HomeWidgetBackgroundIntent.getBroadcast(context,
Uri.parse("homewidget://show?widgetId=$widgetId"))
val backgroundIntent = HomeWidgetBackgroundIntent.getBroadcast(
context,
Uri.parse("homewidget://show?widgetId=$widgetId")
)
remoteViews.setOnClickPendingIntent(R.id.widget_otp, backgroundIntent)}
}

fun _setTokenOtp(context: Context, widgetData: SharedPreferences, widgetId: Int, nightModeSuffix: String, remoteViews: RemoteViews) {
_loadImageFromWidgetDataString(widgetData, "_tokenOtp$widgetId$nightModeSuffix", R.id.widget_otp, remoteViews)
// Otp is visible, so the user can copy it to the clipboard with the next click
val clipIntent = HomeWidgetBackgroundIntent.getBroadcast(context,
Uri.parse("homewidget://copy?widgetId=$widgetId"))
val clipIntent = HomeWidgetBackgroundIntent.getBroadcast(
context,
Uri.parse("homewidget://copy?widgetId=$widgetId")
)
remoteViews.setOnClickPendingIntent(R.id.widget_otp, clipIntent)
}

Expand All @@ -145,35 +153,38 @@ class AppWidgetProvider : HomeWidgetProvider() {
}

fun _setContainerEmpty(context: Context, widgetData: SharedPreferences, widgetId: Int, nightModeSuffix: String, remoteViews: RemoteViews) {
// No token yet, so the user has to select one
val pendingIntent = HomeWidgetLaunchIntent.getActivity(
context,
MainActivity::class.java,
Uri.parse("homewidgetnavigate://link?id=$widgetId")
)
remoteViews.setOnClickPendingIntent(R.id.widget_background, pendingIntent)
remoteViews.setOnClickPendingIntent(R.id.widget_otp, pendingIntent)
_loadImageFromWidgetDataString(widgetData, "_tokenContainerEmpty$nightModeSuffix", R.id.widget_otp, remoteViews)
remoteViews.setImageViewBitmap(R.id.widget_settings, null);
remoteViews.setImageViewBitmap(R.id.widget_action, null);
// No token yet, so the user has to select one
val pendingIntent = HomeWidgetLaunchIntent.getActivity(context,
MainActivity::class.java,
Uri.parse("homewidgetnavigate://link?id=$widgetId"))
remoteViews.setOnClickPendingIntent(R.id.widget_background, pendingIntent)
}



fun _loadImageFromWidgetDataString(widgetData: SharedPreferences, key: String, xmlElement: Int, view: RemoteViews): Boolean {

println("Try to load image from key: $key")
val imagePath = widgetData.getString("$key", null)
if(imagePath == null) {
println("imagePath is null")
view.setImageViewBitmap(xmlElement, null)
return false
}
}

val imageFile = File(imagePath)
val imageExists = imageFile.exists()
if (imageExists && imageFile.absolutePath == null) {
println("image not found!, looked @: $imagePath")
return false
}

println("imagePath is $imagePath")
try {
val myBitmap: Bitmap = BitmapFactory.decodeFile(imageFile.absolutePath)
Expand Down
4 changes: 2 additions & 2 deletions ...essors/scheme_processors/navigation_scheme_processors/home_widget_navigate_processor.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,8 +165,9 @@ class NavigationHandler<R> with ResultHandler {
Future<List<R>?> handleProcessorResults(List<ProcessorResult> results, Map<String, dynamic> args) async {
final successResults = results.whereType<ProcessorResult<Navigation>>().toList().successResults;
if (successResults.isEmpty) return null;
final BuildContext context;
try {
validate(
context = validate(
value: args['context'],
validator: const ObjectValidator<BuildContext>(),
name: 'context',
Expand All @@ -180,7 +181,6 @@ class NavigationHandler<R> with ResultHandler {
return null;
}
List<Navigation> navigations = successResults.getData();
final context = args['context'];
final retunValues = <R>[];
for (final navigation in navigations) {
retunValues.add(await navigation(context));
Expand Down
2 changes: 1 addition & 1 deletion lib/utils/home_widget_utils.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ class HomeWidgetUtils {
// _packageId must be the exact id of the package variable in "AndroidManifest.xml" !! NOT the applicationId of the flavor !!
static const String _packageId = "it.netknights.piauthenticator";
static Future<List<OTPToken>> _loadTokensFromRepo() async => (await _tokenRepository?.loadTokens())?.whereType<OTPToken>().toList() ?? [];
static Future<OTPToken> _loadTokenFromRepo(String tokenId) async => (await _tokenRepository?.loadToken(tokenId)) as OTPToken;
static Future<OTPToken?> _loadTokenFromRepo(String tokenId) async => (await _tokenRepository?.loadToken(tokenId)) as OTPToken?;
static Future<void>? _saveTokensToRepo(List<OTPToken> tokens) => _tokenRepository?.saveOrReplaceTokens(tokens);

static Future<List<TokenFolder>> _loadFoldersFromRepo() async {
Expand Down

0 comments on commit 38841f4

Please sign in to comment.