Compare commits
4 Commits
80d5199259
...
2deb84aa42
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2deb84aa42 | ||
|
|
5528c44f2b | ||
|
|
28a825a460 | ||
|
|
b585c4d183 |
@@ -101,6 +101,8 @@ dependencies {
|
||||
implementation project(':capacitor-android')
|
||||
implementation project(':capacitor-community-sqlite')
|
||||
implementation "androidx.biometric:biometric:1.2.0-alpha05"
|
||||
// Gson for JSON parsing in native notification fetcher
|
||||
implementation "com.google.code.gson:gson:2.10.1"
|
||||
testImplementation "junit:junit:$junitVersion"
|
||||
androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
|
||||
androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<application
|
||||
android:name=".TimeSafariApplication"
|
||||
android:allowBackup="true"
|
||||
android:icon="@mipmap/ic_launcher"
|
||||
android:label="@string/app_name"
|
||||
|
||||
@@ -0,0 +1,118 @@
|
||||
/**
|
||||
* TimeSafariApplication.java
|
||||
*
|
||||
* Application class for the TimeSafari app.
|
||||
* Registers the native content fetcher for the Daily Notification Plugin.
|
||||
*
|
||||
* @author TimeSafari Team
|
||||
* @version 1.0.0
|
||||
*/
|
||||
|
||||
package app.timesafari;
|
||||
|
||||
import android.app.Application;
|
||||
import android.app.NotificationChannel;
|
||||
import android.app.NotificationManager;
|
||||
import android.content.Context;
|
||||
import android.os.Build;
|
||||
import android.util.Log;
|
||||
import com.timesafari.dailynotification.DailyNotificationPlugin;
|
||||
import com.timesafari.dailynotification.NativeNotificationContentFetcher;
|
||||
|
||||
/**
|
||||
* Application class that registers native fetcher for daily notifications
|
||||
*/
|
||||
public class TimeSafariApplication extends Application {
|
||||
|
||||
private static final String TAG = "TimeSafariApplication";
|
||||
|
||||
@Override
|
||||
public void onCreate() {
|
||||
super.onCreate();
|
||||
|
||||
// Instrumentation: Log app initialization with process info
|
||||
int pid = android.os.Process.myPid();
|
||||
String processName = getApplicationInfo().processName;
|
||||
Log.i(TAG, String.format(
|
||||
"APP|ON_CREATE ts=%d pid=%d processName=%s",
|
||||
System.currentTimeMillis(),
|
||||
pid,
|
||||
processName
|
||||
));
|
||||
|
||||
Log.i(TAG, "Initializing TimeSafari Application");
|
||||
|
||||
// Create notification channel for daily notifications (required for Android 8.0+)
|
||||
createNotificationChannel();
|
||||
|
||||
// Register native fetcher with application context
|
||||
Context context = getApplicationContext();
|
||||
NativeNotificationContentFetcher nativeFetcher =
|
||||
new TimeSafariNativeFetcher(context);
|
||||
|
||||
// Instrumentation: Log before registration
|
||||
Log.i(TAG, String.format(
|
||||
"FETCHER|REGISTER_START instanceHash=%d ts=%d",
|
||||
nativeFetcher.hashCode(),
|
||||
System.currentTimeMillis()
|
||||
));
|
||||
|
||||
DailyNotificationPlugin.setNativeFetcher(nativeFetcher);
|
||||
|
||||
// Instrumentation: Verify registration succeeded
|
||||
NativeNotificationContentFetcher verified =
|
||||
DailyNotificationPlugin.getNativeFetcherStatic();
|
||||
boolean registered = (verified != null && verified == nativeFetcher);
|
||||
|
||||
Log.i(TAG, String.format(
|
||||
"FETCHER|REGISTERED providerKey=DailyNotificationPlugin instanceHash=%d registered=%s ts=%d",
|
||||
nativeFetcher.hashCode(),
|
||||
registered,
|
||||
System.currentTimeMillis()
|
||||
));
|
||||
|
||||
Log.i(TAG, "Native fetcher registered: " + nativeFetcher.getClass().getName());
|
||||
}
|
||||
|
||||
/**
|
||||
* Create notification channel for daily notifications
|
||||
* Required for Android 8.0 (API 26) and above
|
||||
*/
|
||||
private void createNotificationChannel() {
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
|
||||
NotificationManager notificationManager =
|
||||
(NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
|
||||
|
||||
if (notificationManager == null) {
|
||||
Log.w(TAG, "NotificationManager is null, cannot create channel");
|
||||
return;
|
||||
}
|
||||
|
||||
// Channel ID must match the one used in DailyNotificationWorker
|
||||
String channelId = "timesafari.daily";
|
||||
String channelName = "Daily Notifications";
|
||||
String channelDescription = "Daily notification updates from TimeSafari";
|
||||
|
||||
// Check if channel already exists
|
||||
NotificationChannel existingChannel = notificationManager.getNotificationChannel(channelId);
|
||||
if (existingChannel != null) {
|
||||
Log.d(TAG, "Notification channel already exists: " + channelId);
|
||||
return;
|
||||
}
|
||||
|
||||
// Create the channel with high importance (for priority="high" notifications)
|
||||
NotificationChannel channel = new NotificationChannel(
|
||||
channelId,
|
||||
channelName,
|
||||
NotificationManager.IMPORTANCE_HIGH
|
||||
);
|
||||
channel.setDescription(channelDescription);
|
||||
channel.enableVibration(true);
|
||||
channel.setShowBadge(true);
|
||||
|
||||
notificationManager.createNotificationChannel(channel);
|
||||
Log.i(TAG, "Notification channel created: " + channelId);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,605 @@
|
||||
/**
|
||||
* TimeSafariNativeFetcher.java
|
||||
*
|
||||
* Implementation of NativeNotificationContentFetcher for the TimeSafari app.
|
||||
* Fetches notification content from the endorser API endpoint.
|
||||
*
|
||||
* @author TimeSafari Team
|
||||
* @version 1.0.0
|
||||
*/
|
||||
|
||||
package app.timesafari;
|
||||
|
||||
import android.content.Context;
|
||||
import android.content.SharedPreferences;
|
||||
import android.util.Log;
|
||||
import androidx.annotation.NonNull;
|
||||
import com.timesafari.dailynotification.FetchContext;
|
||||
import com.timesafari.dailynotification.NativeNotificationContentFetcher;
|
||||
import com.timesafari.dailynotification.NotificationContent;
|
||||
import com.google.gson.Gson;
|
||||
import com.google.gson.JsonObject;
|
||||
import com.google.gson.JsonArray;
|
||||
import com.google.gson.JsonParser;
|
||||
import java.io.BufferedReader;
|
||||
import java.io.InputStreamReader;
|
||||
import java.io.OutputStream;
|
||||
import java.net.HttpURLConnection;
|
||||
import java.net.URL;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.concurrent.CompletableFuture;
|
||||
|
||||
/**
|
||||
* Native content fetcher implementation for TimeSafari
|
||||
*
|
||||
* Fetches notification content from the endorser API endpoint.
|
||||
* Uses the same endpoint as the TypeScript code: /api/v2/report/plansLastUpdatedBetween
|
||||
*/
|
||||
public class TimeSafariNativeFetcher implements NativeNotificationContentFetcher {
|
||||
|
||||
private static final String TAG = "TimeSafariNativeFetcher";
|
||||
private static final String ENDORSER_ENDPOINT = "/api/v2/report/plansLastUpdatedBetween";
|
||||
private static final int CONNECT_TIMEOUT_MS = 10000; // 10 seconds
|
||||
private static final int READ_TIMEOUT_MS = 15000; // 15 seconds
|
||||
private static final int MAX_RETRIES = 3; // Maximum number of retry attempts
|
||||
private static final int RETRY_DELAY_MS = 1000; // Base delay for exponential backoff
|
||||
|
||||
// SharedPreferences constants
|
||||
// NOTE: Must match plugin's SharedPreferences name and keys for starred plans
|
||||
// Plugin uses "daily_notification_timesafari" (see DailyNotificationPlugin.updateStarredPlans)
|
||||
private static final String PREFS_NAME = "daily_notification_timesafari";
|
||||
private static final String KEY_STARRED_PLAN_IDS = "starredPlanIds"; // Matches plugin key
|
||||
private static final String KEY_LAST_ACKED_JWT_ID = "last_acked_jwt_id"; // For pagination
|
||||
|
||||
private final Gson gson = new Gson();
|
||||
private final Context appContext;
|
||||
private SharedPreferences prefs;
|
||||
|
||||
// Volatile fields for configuration, set via configure() method
|
||||
private volatile String apiBaseUrl;
|
||||
private volatile String activeDid;
|
||||
private volatile String jwtToken; // Pre-generated JWT token from TypeScript (ES256K signed)
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
*
|
||||
* @param context Application context for SharedPreferences access
|
||||
*/
|
||||
public TimeSafariNativeFetcher(Context context) {
|
||||
this.appContext = context.getApplicationContext();
|
||||
this.prefs = appContext.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
|
||||
Log.d(TAG, "TimeSafariNativeFetcher: Initialized with context");
|
||||
}
|
||||
|
||||
/**
|
||||
* Configure the native fetcher with API credentials
|
||||
*
|
||||
* Called by the plugin when configureNativeFetcher() is invoked from TypeScript.
|
||||
* This method stores the configuration for use in background fetches.
|
||||
*
|
||||
* <p><b>Architecture Note:</b> The JWT token is pre-generated in TypeScript using
|
||||
* TimeSafari's {@code accessTokenForBackground()} function (ES256K DID-based signing).
|
||||
* The native fetcher just uses the token directly - no JWT generation needed.</p>
|
||||
*
|
||||
* @param apiBaseUrl Base URL for API server (e.g., "https://api.endorser.ch")
|
||||
* @param activeDid Active DID for authentication (e.g., "did:ethr:0x...")
|
||||
* @param jwtToken Pre-generated JWT token (ES256K signed) from TypeScript
|
||||
*/
|
||||
@Override
|
||||
public void configure(String apiBaseUrl, String activeDid, String jwtToken) {
|
||||
// Instrumentation: Log configuration start
|
||||
int pid = android.os.Process.myPid();
|
||||
Log.i(TAG, String.format(
|
||||
"FETCHER|CONFIGURE_START instanceHash=%d pid=%d ts=%d",
|
||||
this.hashCode(),
|
||||
pid,
|
||||
System.currentTimeMillis()
|
||||
));
|
||||
|
||||
this.apiBaseUrl = apiBaseUrl;
|
||||
this.activeDid = activeDid;
|
||||
this.jwtToken = jwtToken;
|
||||
|
||||
// Instrumentation: Log configuration completion
|
||||
boolean configured = (apiBaseUrl != null && activeDid != null && jwtToken != null);
|
||||
Log.i(TAG, String.format(
|
||||
"FETCHER|CONFIGURE_COMPLETE instanceHash=%d configured=%s apiBaseUrl=%s activeDid=%s jwtLength=%d ts=%d",
|
||||
this.hashCode(),
|
||||
configured,
|
||||
apiBaseUrl != null ? apiBaseUrl : "null",
|
||||
activeDid != null ? activeDid.substring(0, Math.min(30, activeDid.length())) + "..." : "null",
|
||||
jwtToken != null ? jwtToken.length() : 0,
|
||||
System.currentTimeMillis()
|
||||
));
|
||||
|
||||
// Enhanced logging for JWT diagnostic purposes
|
||||
Log.i(TAG, "TimeSafariNativeFetcher: Configured with API: " + apiBaseUrl);
|
||||
if (activeDid != null) {
|
||||
Log.i(TAG, "TimeSafariNativeFetcher: ActiveDID: " + activeDid.substring(0, Math.min(30, activeDid.length())) +
|
||||
(activeDid.length() > 30 ? "..." : ""));
|
||||
} else {
|
||||
Log.w(TAG, "TimeSafariNativeFetcher: ActiveDID is NULL");
|
||||
}
|
||||
|
||||
if (jwtToken != null) {
|
||||
Log.i(TAG, "TimeSafariNativeFetcher: JWT token received - Length: " + jwtToken.length() + " chars");
|
||||
// Log first and last 10 chars for verification (not full token for security)
|
||||
String tokenPreview = jwtToken.length() > 20
|
||||
? jwtToken.substring(0, 10) + "..." + jwtToken.substring(jwtToken.length() - 10)
|
||||
: jwtToken.substring(0, Math.min(jwtToken.length(), 20)) + "...";
|
||||
Log.d(TAG, "TimeSafariNativeFetcher: JWT preview: " + tokenPreview);
|
||||
} else {
|
||||
Log.e(TAG, "TimeSafariNativeFetcher: JWT token is NULL - API calls will fail");
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
@NonNull
|
||||
public CompletableFuture<List<NotificationContent>> fetchContent(
|
||||
@NonNull FetchContext context) {
|
||||
|
||||
// Instrumentation: Log fetch start with context
|
||||
int pid = android.os.Process.myPid();
|
||||
Log.i(TAG, String.format(
|
||||
"PREFETCH|START id=%s notifyAt=%d trigger=%s instanceHash=%d pid=%d ts=%d",
|
||||
context.scheduledTime != null ? "daily_" + context.scheduledTime : "unknown",
|
||||
context.scheduledTime != null ? context.scheduledTime : 0,
|
||||
context.trigger,
|
||||
this.hashCode(),
|
||||
pid,
|
||||
System.currentTimeMillis()
|
||||
));
|
||||
|
||||
Log.d(TAG, "TimeSafariNativeFetcher: Fetch triggered - trigger=" + context.trigger +
|
||||
", scheduledTime=" + context.scheduledTime + ", fetchTime=" + context.fetchTime);
|
||||
|
||||
// Start with retry count 0
|
||||
return fetchContentWithRetry(context, 0);
|
||||
}
|
||||
|
||||
/**
|
||||
* Fetch content with retry logic for transient errors
|
||||
*
|
||||
* @param context Fetch context
|
||||
* @param retryCount Current retry attempt (0 for first attempt)
|
||||
* @return Future with notification contents or empty list on failure
|
||||
*/
|
||||
private CompletableFuture<List<NotificationContent>> fetchContentWithRetry(
|
||||
@NonNull FetchContext context, int retryCount) {
|
||||
|
||||
return CompletableFuture.supplyAsync(() -> {
|
||||
try {
|
||||
// Check if configured
|
||||
if (apiBaseUrl == null || activeDid == null || jwtToken == null) {
|
||||
Log.e(TAG, String.format(
|
||||
"PREFETCH|SOURCE from=fallback reason=not_configured apiBaseUrl=%s activeDid=%s jwtToken=%s ts=%d",
|
||||
apiBaseUrl != null ? "set" : "null",
|
||||
activeDid != null ? "set" : "null",
|
||||
jwtToken != null ? "set" : "null",
|
||||
System.currentTimeMillis()
|
||||
));
|
||||
Log.e(TAG, "TimeSafariNativeFetcher: Not configured. Call configureNativeFetcher() from TypeScript first.");
|
||||
return Collections.emptyList();
|
||||
}
|
||||
|
||||
// Instrumentation: Log native fetcher usage
|
||||
Log.i(TAG, String.format(
|
||||
"PREFETCH|SOURCE from=native instanceHash=%d apiBaseUrl=%s ts=%d",
|
||||
this.hashCode(),
|
||||
apiBaseUrl,
|
||||
System.currentTimeMillis()
|
||||
));
|
||||
|
||||
Log.i(TAG, "TimeSafariNativeFetcher: Starting fetch from " + apiBaseUrl + ENDORSER_ENDPOINT);
|
||||
|
||||
// Build request URL
|
||||
String urlString = apiBaseUrl + ENDORSER_ENDPOINT;
|
||||
URL url = new URL(urlString);
|
||||
|
||||
// Create HTTP connection
|
||||
HttpURLConnection connection = (HttpURLConnection) url.openConnection();
|
||||
connection.setConnectTimeout(CONNECT_TIMEOUT_MS);
|
||||
connection.setReadTimeout(READ_TIMEOUT_MS);
|
||||
connection.setRequestMethod("POST");
|
||||
connection.setRequestProperty("Content-Type", "application/json");
|
||||
|
||||
// Diagnostic logging for JWT usage
|
||||
if (jwtToken != null) {
|
||||
String jwtPreview = jwtToken.length() > 20
|
||||
? jwtToken.substring(0, 10) + "..." + jwtToken.substring(jwtToken.length() - 10)
|
||||
: jwtToken;
|
||||
Log.d(TAG, "TimeSafariNativeFetcher: Using JWT for API call - Length: " + jwtToken.length() +
|
||||
", Preview: " + jwtPreview + ", ActiveDID: " +
|
||||
(activeDid != null ? activeDid.substring(0, Math.min(30, activeDid.length())) + "..." : "null"));
|
||||
} else {
|
||||
Log.e(TAG, "TimeSafariNativeFetcher: JWT token is NULL when making API call!");
|
||||
}
|
||||
|
||||
connection.setRequestProperty("Authorization", "Bearer " + jwtToken);
|
||||
connection.setDoOutput(true);
|
||||
|
||||
// Build request body
|
||||
Map<String, Object> requestBody = new HashMap<>();
|
||||
requestBody.put("planIds", getStarredPlanIds());
|
||||
|
||||
// afterId is required by the API endpoint
|
||||
// Use "0" for first request (no previous data), or stored jwtId for subsequent requests
|
||||
String afterId = getLastAcknowledgedJwtId();
|
||||
if (afterId == null || afterId.isEmpty()) {
|
||||
afterId = "0"; // First request - start from beginning
|
||||
}
|
||||
requestBody.put("afterId", afterId);
|
||||
|
||||
String jsonBody = gson.toJson(requestBody);
|
||||
Log.d(TAG, "TimeSafariNativeFetcher: Request body: " + jsonBody);
|
||||
|
||||
// Write request body
|
||||
try (OutputStream os = connection.getOutputStream()) {
|
||||
byte[] input = jsonBody.getBytes(StandardCharsets.UTF_8);
|
||||
os.write(input, 0, input.length);
|
||||
}
|
||||
|
||||
// Execute request
|
||||
int responseCode = connection.getResponseCode();
|
||||
Log.d(TAG, "TimeSafariNativeFetcher: HTTP response code: " + responseCode);
|
||||
|
||||
if (responseCode == 200) {
|
||||
// Read response
|
||||
BufferedReader reader = new BufferedReader(
|
||||
new InputStreamReader(connection.getInputStream(), StandardCharsets.UTF_8));
|
||||
StringBuilder response = new StringBuilder();
|
||||
String line;
|
||||
while ((line = reader.readLine()) != null) {
|
||||
response.append(line);
|
||||
}
|
||||
reader.close();
|
||||
|
||||
String responseBody = response.toString();
|
||||
Log.d(TAG, "TimeSafariNativeFetcher: Response body length: " + responseBody.length());
|
||||
|
||||
// Parse response and convert to NotificationContent
|
||||
List<NotificationContent> contents = parseApiResponse(responseBody, context);
|
||||
|
||||
// Update last acknowledged JWT ID from the response (for pagination)
|
||||
if (!contents.isEmpty()) {
|
||||
// Get the last JWT ID from the parsed response (stored during parsing)
|
||||
updateLastAckedJwtIdFromResponse(contents, responseBody);
|
||||
}
|
||||
|
||||
Log.i(TAG, "TimeSafariNativeFetcher: Successfully fetched " + contents.size() +
|
||||
" notification(s)");
|
||||
|
||||
// Instrumentation: Log successful fetch
|
||||
Log.i(TAG, String.format(
|
||||
"PREFETCH|WRITE_OK id=%s items=%d ts=%d",
|
||||
context.scheduledTime != null ? "daily_" + context.scheduledTime : "unknown",
|
||||
contents.size(),
|
||||
System.currentTimeMillis()
|
||||
));
|
||||
|
||||
return contents;
|
||||
|
||||
} else {
|
||||
// Read error response
|
||||
String errorMessage = "Unknown error";
|
||||
try {
|
||||
BufferedReader reader = new BufferedReader(
|
||||
new InputStreamReader(connection.getErrorStream(), StandardCharsets.UTF_8));
|
||||
StringBuilder errorResponse = new StringBuilder();
|
||||
String line;
|
||||
while ((line = reader.readLine()) != null) {
|
||||
errorResponse.append(line);
|
||||
}
|
||||
reader.close();
|
||||
errorMessage = errorResponse.toString();
|
||||
} catch (Exception e) {
|
||||
Log.w(TAG, "TimeSafariNativeFetcher: Could not read error stream", e);
|
||||
}
|
||||
|
||||
Log.e(TAG, "TimeSafariNativeFetcher: API error " + responseCode + ": " + errorMessage);
|
||||
|
||||
// Handle retryable errors (5xx server errors, network timeouts)
|
||||
if (shouldRetry(responseCode, retryCount)) {
|
||||
long delayMs = RETRY_DELAY_MS * (1 << retryCount); // Exponential backoff
|
||||
Log.w(TAG, "TimeSafariNativeFetcher: Retryable error, retrying in " + delayMs + "ms " +
|
||||
"(" + (retryCount + 1) + "/" + MAX_RETRIES + ")");
|
||||
|
||||
try {
|
||||
Thread.sleep(delayMs);
|
||||
} catch (InterruptedException e) {
|
||||
Thread.currentThread().interrupt();
|
||||
Log.e(TAG, "TimeSafariNativeFetcher: Retry delay interrupted", e);
|
||||
return Collections.emptyList();
|
||||
}
|
||||
|
||||
// Recursive retry
|
||||
return fetchContentWithRetry(context, retryCount + 1).join();
|
||||
}
|
||||
|
||||
// Non-retryable errors (4xx client errors, max retries reached)
|
||||
if (responseCode >= 400 && responseCode < 500) {
|
||||
Log.e(TAG, "TimeSafariNativeFetcher: Non-retryable client error " + responseCode);
|
||||
} else if (retryCount >= MAX_RETRIES) {
|
||||
Log.e(TAG, "TimeSafariNativeFetcher: Max retries (" + MAX_RETRIES + ") reached");
|
||||
}
|
||||
|
||||
// Return empty list on error (fallback will be handled by worker)
|
||||
return Collections.emptyList();
|
||||
}
|
||||
|
||||
} catch (java.net.SocketTimeoutException | java.net.UnknownHostException e) {
|
||||
// Network errors are retryable
|
||||
Log.w(TAG, "TimeSafariNativeFetcher: Network error during fetch", e);
|
||||
|
||||
if (shouldRetry(0, retryCount)) { // Use 0 as response code for network errors
|
||||
long delayMs = RETRY_DELAY_MS * (1 << retryCount);
|
||||
Log.w(TAG, "TimeSafariNativeFetcher: Retrying after network error in " + delayMs + "ms " +
|
||||
"(" + (retryCount + 1) + "/" + MAX_RETRIES + ")");
|
||||
|
||||
try {
|
||||
Thread.sleep(delayMs);
|
||||
} catch (InterruptedException ie) {
|
||||
Thread.currentThread().interrupt();
|
||||
Log.e(TAG, "TimeSafariNativeFetcher: Retry delay interrupted", ie);
|
||||
return Collections.emptyList();
|
||||
}
|
||||
|
||||
return fetchContentWithRetry(context, retryCount + 1).join();
|
||||
}
|
||||
|
||||
Log.e(TAG, "TimeSafariNativeFetcher: Max retries reached for network error");
|
||||
return Collections.emptyList();
|
||||
|
||||
} catch (Exception e) {
|
||||
Log.e(TAG, "TimeSafariNativeFetcher: Error during fetch", e);
|
||||
// Non-retryable errors (parsing, configuration, etc.)
|
||||
return Collections.emptyList();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Determine if an error should be retried
|
||||
*
|
||||
* @param responseCode HTTP response code (0 for network errors)
|
||||
* @param retryCount Current retry attempt count
|
||||
* @return true if error is retryable and retry count not exceeded
|
||||
*/
|
||||
private boolean shouldRetry(int responseCode, int retryCount) {
|
||||
if (retryCount >= MAX_RETRIES) {
|
||||
return false; // Max retries exceeded
|
||||
}
|
||||
|
||||
// Retry on network errors (responseCode 0) or server errors (5xx)
|
||||
// Don't retry on client errors (4xx) as they indicate permanent issues
|
||||
if (responseCode == 0) {
|
||||
return true; // Network error (timeout, unknown host, etc.)
|
||||
}
|
||||
|
||||
if (responseCode >= 500 && responseCode < 600) {
|
||||
return true; // Server error (retryable)
|
||||
}
|
||||
|
||||
// Some 4xx errors might be retryable (e.g., 429 Too Many Requests)
|
||||
if (responseCode == 429) {
|
||||
return true; // Rate limit - retry with backoff
|
||||
}
|
||||
|
||||
return false; // Other client errors (401, 403, 404, etc.) are not retryable
|
||||
}
|
||||
|
||||
/**
|
||||
* Get starred plan IDs from SharedPreferences
|
||||
*
|
||||
* @return List of starred plan IDs, empty list if none stored
|
||||
*/
|
||||
private List<String> getStarredPlanIds() {
|
||||
try {
|
||||
// Use the same SharedPreferences as the plugin (not the instance variable 'prefs')
|
||||
// Plugin stores in "daily_notification_timesafari" with key "starredPlanIds"
|
||||
SharedPreferences pluginPrefs = appContext.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
|
||||
String idsJson = pluginPrefs.getString(KEY_STARRED_PLAN_IDS, "[]");
|
||||
|
||||
if (idsJson == null || idsJson.isEmpty() || idsJson.equals("[]")) {
|
||||
Log.d(TAG, "TimeSafariNativeFetcher: No starred plan IDs found in SharedPreferences");
|
||||
return new ArrayList<>();
|
||||
}
|
||||
|
||||
// Parse JSON array (plugin stores as JSON string)
|
||||
JsonParser parser = new JsonParser();
|
||||
JsonArray jsonArray = parser.parse(idsJson).getAsJsonArray();
|
||||
List<String> planIds = new ArrayList<>();
|
||||
|
||||
for (int i = 0; i < jsonArray.size(); i++) {
|
||||
planIds.add(jsonArray.get(i).getAsString());
|
||||
}
|
||||
|
||||
Log.i(TAG, "TimeSafariNativeFetcher: Loaded " + planIds.size() + " starred plan IDs from SharedPreferences");
|
||||
if (planIds.size() > 0) {
|
||||
Log.d(TAG, "TimeSafariNativeFetcher: First plan ID: " +
|
||||
planIds.get(0).substring(0, Math.min(30, planIds.get(0).length())) + "...");
|
||||
}
|
||||
return planIds;
|
||||
|
||||
} catch (Exception e) {
|
||||
Log.e(TAG, "TimeSafariNativeFetcher: Error loading starred plan IDs from SharedPreferences", e);
|
||||
return new ArrayList<>();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Get last acknowledged JWT ID from SharedPreferences (for pagination)
|
||||
*
|
||||
* @return Last acknowledged JWT ID, or null if none stored
|
||||
*/
|
||||
private String getLastAcknowledgedJwtId() {
|
||||
try {
|
||||
String jwtId = prefs.getString(KEY_LAST_ACKED_JWT_ID, null);
|
||||
if (jwtId != null) {
|
||||
Log.d(TAG, "TimeSafariNativeFetcher: Loaded last acknowledged JWT ID");
|
||||
}
|
||||
return jwtId;
|
||||
} catch (Exception e) {
|
||||
Log.e(TAG, "TimeSafariNativeFetcher: Error loading last acknowledged JWT ID", e);
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Update last acknowledged JWT ID from the API response
|
||||
* Uses the last JWT ID from the data array for pagination
|
||||
*
|
||||
* @param contents Parsed notification contents (may contain JWT IDs)
|
||||
* @param responseBody Original response body for parsing
|
||||
*/
|
||||
private void updateLastAckedJwtIdFromResponse(List<NotificationContent> contents, String responseBody) {
|
||||
try {
|
||||
JsonParser parser = new JsonParser();
|
||||
JsonObject root = parser.parse(responseBody).getAsJsonObject();
|
||||
JsonArray dataArray = root.getAsJsonArray("data");
|
||||
|
||||
if (dataArray != null && dataArray.size() > 0) {
|
||||
// Get the last item's JWT ID (most recent)
|
||||
JsonObject lastItem = dataArray.get(dataArray.size() - 1).getAsJsonObject();
|
||||
|
||||
// Try to get JWT ID from different possible locations in response structure
|
||||
String jwtId = null;
|
||||
if (lastItem.has("jwtId")) {
|
||||
jwtId = lastItem.get("jwtId").getAsString();
|
||||
} else if (lastItem.has("plan")) {
|
||||
JsonObject plan = lastItem.getAsJsonObject("plan");
|
||||
if (plan.has("jwtId")) {
|
||||
jwtId = plan.get("jwtId").getAsString();
|
||||
}
|
||||
}
|
||||
|
||||
if (jwtId != null && !jwtId.isEmpty()) {
|
||||
updateLastAckedJwtId(jwtId);
|
||||
Log.d(TAG, "TimeSafariNativeFetcher: Updated last acknowledged JWT ID: " +
|
||||
jwtId.substring(0, Math.min(20, jwtId.length())) + "...");
|
||||
}
|
||||
}
|
||||
} catch (Exception e) {
|
||||
Log.w(TAG, "TimeSafariNativeFetcher: Could not extract JWT ID from response for pagination", e);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Update last acknowledged JWT ID in SharedPreferences
|
||||
*
|
||||
* @param jwtId JWT ID to store as last acknowledged
|
||||
*/
|
||||
private void updateLastAckedJwtId(String jwtId) {
|
||||
try {
|
||||
prefs.edit().putString(KEY_LAST_ACKED_JWT_ID, jwtId).apply();
|
||||
Log.d(TAG, "TimeSafariNativeFetcher: Updated last acknowledged JWT ID");
|
||||
} catch (Exception e) {
|
||||
Log.e(TAG, "TimeSafariNativeFetcher: Error updating last acknowledged JWT ID", e);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Parse API response and convert to NotificationContent list
|
||||
*/
|
||||
private List<NotificationContent> parseApiResponse(String responseBody, FetchContext context) {
|
||||
List<NotificationContent> contents = new ArrayList<>();
|
||||
|
||||
try {
|
||||
JsonParser parser = new JsonParser();
|
||||
JsonObject root = parser.parse(responseBody).getAsJsonObject();
|
||||
|
||||
// Parse response structure (matches PlansLastUpdatedResponse)
|
||||
JsonArray dataArray = root.getAsJsonArray("data");
|
||||
if (dataArray != null) {
|
||||
for (int i = 0; i < dataArray.size(); i++) {
|
||||
JsonObject item = dataArray.get(i).getAsJsonObject();
|
||||
|
||||
NotificationContent content = new NotificationContent();
|
||||
|
||||
// Extract data from API response
|
||||
// Support both flat structure (jwtId, planId) and nested (plan.jwtId, plan.handleId)
|
||||
String planId = null;
|
||||
String jwtId = null;
|
||||
|
||||
if (item.has("planId")) {
|
||||
planId = item.get("planId").getAsString();
|
||||
} else if (item.has("plan")) {
|
||||
JsonObject plan = item.getAsJsonObject("plan");
|
||||
if (plan.has("handleId")) {
|
||||
planId = plan.get("handleId").getAsString();
|
||||
}
|
||||
}
|
||||
|
||||
if (item.has("jwtId")) {
|
||||
jwtId = item.get("jwtId").getAsString();
|
||||
} else if (item.has("plan")) {
|
||||
JsonObject plan = item.getAsJsonObject("plan");
|
||||
if (plan.has("jwtId")) {
|
||||
jwtId = plan.get("jwtId").getAsString();
|
||||
}
|
||||
}
|
||||
|
||||
// Create notification ID
|
||||
String notificationId = "endorser_" + (jwtId != null ? jwtId :
|
||||
System.currentTimeMillis() + "_" + i);
|
||||
content.setId(notificationId);
|
||||
|
||||
// Create notification title
|
||||
String title = "Project Update";
|
||||
if (planId != null) {
|
||||
title = "Update: " + planId.substring(Math.max(0, planId.length() - 8));
|
||||
}
|
||||
content.setTitle(title);
|
||||
|
||||
// Create notification body
|
||||
StringBuilder body = new StringBuilder();
|
||||
if (planId != null) {
|
||||
body.append("Plan ").append(planId.substring(Math.max(0, planId.length() - 12))).append(" has been updated.");
|
||||
} else {
|
||||
body.append("A project you follow has been updated.");
|
||||
}
|
||||
content.setBody(body.toString());
|
||||
|
||||
// Use scheduled time from context, or default to 1 hour from now
|
||||
long scheduledTimeMs = context.scheduledTime != null ?
|
||||
context.scheduledTime : (System.currentTimeMillis() + 3600000);
|
||||
content.setScheduledTime(scheduledTimeMs);
|
||||
|
||||
// Set notification properties
|
||||
content.setPriority("default");
|
||||
content.setSound(true);
|
||||
|
||||
contents.add(content);
|
||||
}
|
||||
}
|
||||
|
||||
// If no data items, create a default notification
|
||||
if (contents.isEmpty()) {
|
||||
NotificationContent defaultContent = new NotificationContent();
|
||||
defaultContent.setId("endorser_no_updates_" + System.currentTimeMillis());
|
||||
defaultContent.setTitle("No Project Updates");
|
||||
defaultContent.setBody("No updates found in your starred projects.");
|
||||
|
||||
long scheduledTimeMs = context.scheduledTime != null ?
|
||||
context.scheduledTime : (System.currentTimeMillis() + 3600000);
|
||||
defaultContent.setScheduledTime(scheduledTimeMs);
|
||||
defaultContent.setPriority("default");
|
||||
defaultContent.setSound(true);
|
||||
|
||||
contents.add(defaultContent);
|
||||
}
|
||||
|
||||
} catch (Exception e) {
|
||||
Log.e(TAG, "TimeSafariNativeFetcher: Error parsing API response", e);
|
||||
// Return empty list on parse error
|
||||
}
|
||||
|
||||
return contents;
|
||||
}
|
||||
}
|
||||
|
||||
109
docs/directives/fix-notification-dismiss-cancel.mdc
Normal file
109
docs/directives/fix-notification-dismiss-cancel.mdc
Normal file
@@ -0,0 +1,109 @@
|
||||
# Fix Notification Dismiss to Cancel Notification
|
||||
|
||||
## Problem
|
||||
|
||||
When a user clicks the "Dismiss" button on a daily notification, the notification is removed from storage and alarms are cancelled, but the notification itself is not cancelled from the NotificationManager. This means the notification remains visible in the system tray even though it's been dismissed.
|
||||
|
||||
Additionally, clicking on the notification (not the dismiss button) launches the app, which is working as intended.
|
||||
|
||||
## Root Cause
|
||||
|
||||
In `DailyNotificationWorker.java`, the `handleDismissNotification()` method:
|
||||
1. ✅ Removes notification from storage
|
||||
2. ✅ Cancels pending alarms
|
||||
3. ❌ **MISSING**: Does not cancel the notification from NotificationManager
|
||||
|
||||
The notification is displayed with ID = `content.getId().hashCode()` (line 440), but this ID is never used to cancel the notification when dismissing.
|
||||
|
||||
## Solution
|
||||
|
||||
Add notification cancellation to `handleDismissNotification()` method in `DailyNotificationWorker.java`.
|
||||
|
||||
### IMPORTANT: Plugin Source Change
|
||||
|
||||
**This change must be applied to the plugin source repository**, not the host app. The file is located in the `@timesafari/daily-notification-plugin` package.
|
||||
|
||||
### File to Modify
|
||||
|
||||
**Plugin Source Repository:**
|
||||
`android/src/main/java/com/timesafari/dailynotification/DailyNotificationWorker.java`
|
||||
|
||||
**Note:** In the host app's `node_modules`, this file is located at:
|
||||
`node_modules/@timesafari/daily-notification-plugin/android/src/main/java/com/timesafari/dailynotification/DailyNotificationWorker.java`
|
||||
|
||||
However, changes to `node_modules` will be overwritten on the next `npm install`. This fix must be applied to the plugin's source repository.
|
||||
|
||||
### Change Required
|
||||
|
||||
In the `handleDismissNotification()` method (around line 177-206), add code to cancel the notification from NotificationManager:
|
||||
|
||||
```java
|
||||
private Result handleDismissNotification(String notificationId) {
|
||||
Trace.beginSection("DN:dismiss");
|
||||
try {
|
||||
Log.d(TAG, "DN|DISMISS_START id=" + notificationId);
|
||||
|
||||
// Cancel the notification from NotificationManager FIRST
|
||||
// This ensures the notification disappears immediately when dismissed
|
||||
NotificationManager notificationManager =
|
||||
(NotificationManager) getApplicationContext().getSystemService(Context.NOTIFICATION_SERVICE);
|
||||
if (notificationManager != null) {
|
||||
int systemNotificationId = notificationId.hashCode();
|
||||
notificationManager.cancel(systemNotificationId);
|
||||
Log.d(TAG, "DN|DISMISS_CANCEL_NOTIF systemId=" + systemNotificationId);
|
||||
}
|
||||
|
||||
// Remove from Room if present; also remove from legacy storage for compatibility
|
||||
try {
|
||||
DailyNotificationStorageRoom room = new DailyNotificationStorageRoom(getApplicationContext());
|
||||
// No direct delete DAO exposed via service; legacy removal still applied
|
||||
} catch (Exception ignored) { }
|
||||
DailyNotificationStorage storage = new DailyNotificationStorage(getApplicationContext());
|
||||
storage.removeNotification(notificationId);
|
||||
|
||||
// Cancel any pending alarms
|
||||
DailyNotificationScheduler scheduler = new DailyNotificationScheduler(
|
||||
getApplicationContext(),
|
||||
(android.app.AlarmManager) getApplicationContext().getSystemService(Context.ALARM_SERVICE)
|
||||
);
|
||||
scheduler.cancelNotification(notificationId);
|
||||
|
||||
Log.i(TAG, "DN|DISMISS_OK id=" + notificationId);
|
||||
return Result.success();
|
||||
|
||||
} catch (Exception e) {
|
||||
Log.e(TAG, "DN|DISMISS_ERR exception id=" + notificationId + " err=" + e.getMessage(), e);
|
||||
return Result.retry();
|
||||
} finally {
|
||||
Trace.endSection();
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
### Key Points
|
||||
|
||||
1. **Notification ID**: Use `notificationId.hashCode()` to match the ID used when displaying (line 440: `int notificationId = content.getId().hashCode()`)
|
||||
2. **Order**: Cancel the notification FIRST, before removing from storage, so it disappears immediately
|
||||
3. **Null check**: Check that NotificationManager is not null before calling cancel()
|
||||
4. **Logging**: Add instrumentation log to track cancellation
|
||||
|
||||
### Expected Behavior After Fix
|
||||
|
||||
1. User clicks "Dismiss" button → Notification disappears immediately from system tray
|
||||
2. User clicks notification body → App launches (unchanged behavior)
|
||||
3. User swipes notification away → Notification dismissed (Android handles this automatically with `setAutoCancel(true)`)
|
||||
|
||||
## Testing Checklist
|
||||
|
||||
- [ ] Click dismiss button → Notification disappears immediately
|
||||
- [ ] Click notification body → App launches
|
||||
- [ ] Swipe notification away → Notification dismissed
|
||||
- [ ] Check logs for `DN|DISMISS_CANCEL_NOTIF` entry
|
||||
- [ ] Verify notification is removed from storage after dismiss
|
||||
- [ ] Verify alarms are cancelled after dismiss
|
||||
|
||||
## Related Code
|
||||
|
||||
- Notification display: `DailyNotificationWorker.displayNotification()` line 440
|
||||
- Notification ID generation: `content.getId().hashCode()`
|
||||
- Auto-cancel: `builder.setAutoCancel(true)` line 363 (handles swipe-to-dismiss)
|
||||
109
docs/prefetch-investigation-summary.md
Normal file
109
docs/prefetch-investigation-summary.md
Normal file
@@ -0,0 +1,109 @@
|
||||
# Prefetch Investigation Summary
|
||||
|
||||
## Problem Statement
|
||||
|
||||
The daily notification prefetch job (T-5 min) is not calling the native fetcher, resulting in:
|
||||
- `from: null` in prefetch logs
|
||||
- Fallback/mock content being used
|
||||
- `DISPLAY_SKIP content_not_found` at notification time
|
||||
- Storage empty (`[]`) when display worker runs
|
||||
|
||||
## Root Cause Hypothesis
|
||||
|
||||
Based on the directive analysis, likely causes (ranked):
|
||||
|
||||
1. **Registration Timing**: Prefetch worker runs before `Application.onCreate()` completes
|
||||
2. **Discovery Failure**: Worker resolves fetcher to `null` (wrong scope, process mismatch)
|
||||
3. **Persistence Bug**: Content written but wiped/deduped before display
|
||||
4. **ID Mismatch**: Prefetch writes `notify_...` but display looks for `daily_...`
|
||||
|
||||
## Instrumentation Added
|
||||
|
||||
### TimeSafariApplication.java
|
||||
- `APP|ON_CREATE ts=... pid=... processName=...` - App initialization timing
|
||||
- `FETCHER|REGISTER_START instanceHash=... ts=...` - Before registration
|
||||
- `FETCHER|REGISTERED providerKey=... instanceHash=... registered=... ts=...` - After registration with verification
|
||||
|
||||
### TimeSafariNativeFetcher.java
|
||||
- `FETCHER|CONFIGURE_START instanceHash=... pid=... ts=...` - Configuration start
|
||||
- `FETCHER|CONFIGURE_COMPLETE instanceHash=... configured=... apiBaseUrl=... activeDid=... jwtLength=... ts=...` - Configuration completion
|
||||
- `PREFETCH|START id=... notifyAt=... trigger=... instanceHash=... pid=... ts=...` - Fetch start
|
||||
- `PREFETCH|SOURCE from=native/fallback reason=... ts=...` - Source resolution
|
||||
- `PREFETCH|WRITE_OK id=... items=... ts=...` - Successful fetch
|
||||
|
||||
## Diagnostic Tools
|
||||
|
||||
### Log Filtering Script
|
||||
```bash
|
||||
./scripts/diagnose-prefetch.sh app.timesafari.app
|
||||
```
|
||||
|
||||
Filters logcat for:
|
||||
- `APP|ON_CREATE`
|
||||
- `FETCHER|*`
|
||||
- `PREFETCH|*`
|
||||
- `DISPLAY|*`
|
||||
- `STORAGE|*`
|
||||
|
||||
### Manual Filtering
|
||||
```bash
|
||||
adb logcat | grep -E "APP\|ON_CREATE|FETCHER\||PREFETCH\||DISPLAY\||STORAGE\|"
|
||||
```
|
||||
|
||||
## Investigation Checklist
|
||||
|
||||
### A. App/Plugin Initialization Order
|
||||
- [ ] Confirm `APP|ON_CREATE` appears before `PREFETCH|START`
|
||||
- [ ] Verify `FETCHER|REGISTERED registered=true`
|
||||
- [ ] Check for multiple `onCreate` invocations (process restarts)
|
||||
- [ ] Confirm single process (no `android:process` on workers)
|
||||
|
||||
### B. Prefetch Worker Resolution
|
||||
- [ ] Check `PREFETCH|SOURCE from=native` (not `from=fallback`)
|
||||
- [ ] Verify `instanceHash` matches between registration and fetch
|
||||
- [ ] Compare `pid` values (should be same process)
|
||||
- [ ] Check `FETCHER|CONFIGURE_COMPLETE configured=true` before prefetch
|
||||
|
||||
### C. Storage & Persistence
|
||||
- [ ] Verify `PREFETCH|WRITE_OK items>=1`
|
||||
- [ ] Check storage logs for content persistence
|
||||
- [ ] Compare prefetch ID vs display lookup ID (must match)
|
||||
|
||||
### D. ID Schema Consistency
|
||||
- [ ] Prefetch ID format: `daily_<epoch>` or `notify_<epoch>`
|
||||
- [ ] Display lookup ID format: must match prefetch ID
|
||||
- [ ] Verify ID derivation rules are consistent
|
||||
|
||||
## Next Steps
|
||||
|
||||
1. **Run diagnostic script** during a notification cycle
|
||||
2. **Analyze logs** for timing issues and process mismatches
|
||||
3. **If fetcher is null**: Implement Fix #2 (Pass Fetcher Context With Work) or Fix #3 (Process-Safe DI)
|
||||
4. **If ID mismatch**: Normalize ID schema across prefetch and display
|
||||
5. **If storage issue**: Add transactional writes and read-after-write verification
|
||||
|
||||
## Expected Log Flow (Success Case)
|
||||
|
||||
```
|
||||
APP|ON_CREATE ts=... pid=... processName=app.timesafari.app
|
||||
FETCHER|REGISTER_START instanceHash=... ts=...
|
||||
FETCHER|REGISTERED providerKey=DailyNotificationPlugin instanceHash=... registered=true ts=...
|
||||
FETCHER|CONFIGURE_START instanceHash=... pid=... ts=...
|
||||
FETCHER|CONFIGURE_COMPLETE instanceHash=... configured=true ... ts=...
|
||||
PREFETCH|START id=daily_... notifyAt=... trigger=prefetch instanceHash=... pid=... ts=...
|
||||
PREFETCH|SOURCE from=native instanceHash=... apiBaseUrl=... ts=...
|
||||
PREFETCH|WRITE_OK id=daily_... items=1 ts=...
|
||||
STORAGE|POST_PREFETCH total=1 ids=[daily_...]
|
||||
DISPLAY|START id=daily_...
|
||||
STORAGE|PRE_DISPLAY total=1 ids=[daily_...]
|
||||
DISPLAY|LOOKUP result=hit id=daily_...
|
||||
```
|
||||
|
||||
## Failure Indicators
|
||||
|
||||
- `PREFETCH|SOURCE from=fallback` - Native fetcher not resolved
|
||||
- `PREFETCH|SOURCE from=null` - Fetcher registration failed
|
||||
- `FETCHER|REGISTERED registered=false` - Registration verification failed
|
||||
- `STORAGE|PRE_DISPLAY total=0` - Content not persisted
|
||||
- `DISPLAY|LOOKUP result=miss` - ID mismatch or content cleared
|
||||
|
||||
2
package-lock.json
generated
2
package-lock.json
generated
@@ -152,7 +152,7 @@
|
||||
},
|
||||
"../daily-notification-plugin": {
|
||||
"name": "@timesafari/daily-notification-plugin",
|
||||
"version": "1.0.8",
|
||||
"version": "1.0.11",
|
||||
"license": "MIT",
|
||||
"workspaces": [
|
||||
"packages/*"
|
||||
|
||||
36
scripts/diagnose-prefetch.sh
Executable file
36
scripts/diagnose-prefetch.sh
Executable file
@@ -0,0 +1,36 @@
|
||||
#!/bin/bash
|
||||
#
|
||||
# Diagnostic script for daily notification prefetch issues
|
||||
# Filters logcat output for prefetch-related instrumentation logs
|
||||
#
|
||||
# Usage:
|
||||
# ./scripts/diagnose-prefetch.sh [package_name]
|
||||
#
|
||||
# Example:
|
||||
# ./scripts/diagnose-prefetch.sh app.timesafari.app
|
||||
#
|
||||
|
||||
set -e
|
||||
|
||||
PACKAGE_NAME="${1:-app.timesafari.app}"
|
||||
|
||||
echo "🔍 Daily Notification Prefetch Diagnostic Tool"
|
||||
echo "=============================================="
|
||||
echo ""
|
||||
echo "Package: $PACKAGE_NAME"
|
||||
echo "Filtering for instrumentation tags:"
|
||||
echo " - APP|ON_CREATE"
|
||||
echo " - FETCHER|*"
|
||||
echo " - PREFETCH|*"
|
||||
echo " - DISPLAY|*"
|
||||
echo " - STORAGE|*"
|
||||
echo ""
|
||||
echo "Press Ctrl+C to stop"
|
||||
echo ""
|
||||
|
||||
# Filter logcat for instrumentation tags
|
||||
adb logcat -c # Clear logcat buffer first
|
||||
|
||||
adb logcat | grep -E "APP\|ON_CREATE|FETCHER\||PREFETCH\||DISPLAY\||STORAGE\||DailyNotification|TimeSafariApplication|TimeSafariNativeFetcher" | \
|
||||
grep -i "$PACKAGE_NAME\|TimeSafari\|DailyNotification"
|
||||
|
||||
@@ -1693,10 +1693,21 @@ export class CapacitorPlatformService
|
||||
|
||||
// Step 3: Get API server from config or use default
|
||||
// This ensures the plugin knows where to fetch content from
|
||||
const apiServer =
|
||||
let apiServer =
|
||||
config.apiServer ||
|
||||
(await import("../../constants/app")).DEFAULT_ENDORSER_API_SERVER;
|
||||
|
||||
// Step 3.5: Convert localhost to 10.0.2.2 for Android emulators
|
||||
// Android emulators can't reach localhost - they need 10.0.2.2 to access the host machine
|
||||
const platform = Capacitor.getPlatform();
|
||||
if (platform === "android" && apiServer) {
|
||||
// Replace localhost or 127.0.0.1 with 10.0.2.2 for Android emulator compatibility
|
||||
apiServer = apiServer.replace(
|
||||
/http:\/\/(localhost|127\.0\.0\.1)(:\d+)?/,
|
||||
"http://10.0.2.2$2",
|
||||
);
|
||||
}
|
||||
|
||||
// Step 4: Configure plugin with credentials
|
||||
// Plugin stores these in its Room database for background workers
|
||||
await DailyNotification.configureNativeFetcher({
|
||||
@@ -1705,11 +1716,34 @@ export class CapacitorPlatformService
|
||||
jwtToken,
|
||||
});
|
||||
|
||||
// Step 5: Update starred plans if provided
|
||||
// This stores the starred plan IDs in SharedPreferences for the native fetcher
|
||||
if (
|
||||
config.starredPlanHandleIds &&
|
||||
config.starredPlanHandleIds.length > 0
|
||||
) {
|
||||
await DailyNotification.updateStarredPlans({
|
||||
planIds: config.starredPlanHandleIds,
|
||||
});
|
||||
logger.info(
|
||||
`[CapacitorPlatformService] Updated starred plans: ${config.starredPlanHandleIds.length} plans`,
|
||||
);
|
||||
} else {
|
||||
// Clear starred plans if none provided
|
||||
await DailyNotification.updateStarredPlans({
|
||||
planIds: [],
|
||||
});
|
||||
logger.info(
|
||||
"[CapacitorPlatformService] Cleared starred plans (none provided)",
|
||||
);
|
||||
}
|
||||
|
||||
logger.info("[CapacitorPlatformService] Configured native fetcher", {
|
||||
activeDid,
|
||||
apiServer,
|
||||
tokenExpirationHours: 72,
|
||||
tokenExpirationMinutes: expirationMinutes,
|
||||
starredPlansCount: config.starredPlanHandleIds?.length || 0,
|
||||
});
|
||||
} catch (error) {
|
||||
logger.error(
|
||||
|
||||
@@ -825,6 +825,7 @@ import {
|
||||
import { logger } from "../utils/logger";
|
||||
import { PlatformServiceMixin } from "../utils/PlatformServiceMixin";
|
||||
import { createNotifyHelpers, TIMEOUTS } from "@/utils/notify";
|
||||
import { PlatformServiceFactory } from "../services/PlatformServiceFactory";
|
||||
import { ACCOUNT_VIEW_CONSTANTS } from "@/constants/accountView";
|
||||
import { showSeedPhraseReminder } from "@/utils/seedPhraseReminder";
|
||||
import {
|
||||
@@ -1547,6 +1548,33 @@ export default class AccountViewView extends Vue {
|
||||
settingsSaved: true,
|
||||
timestamp: new Date().toISOString(),
|
||||
});
|
||||
|
||||
// Refresh native fetcher configuration with new API server
|
||||
// This ensures background notification prefetch uses the updated endpoint
|
||||
try {
|
||||
const platformService = PlatformServiceFactory.getInstance();
|
||||
const settings = await this.$accountSettings();
|
||||
const starredPlanHandleIds = settings.starredPlanHandleIds || [];
|
||||
|
||||
await platformService.configureNativeFetcher({
|
||||
apiServer: newApiServer,
|
||||
jwt: "", // Will be generated automatically by configureNativeFetcher
|
||||
starredPlanHandleIds,
|
||||
});
|
||||
|
||||
logger.info(
|
||||
"[AccountViewView] Native fetcher configuration refreshed after API server change",
|
||||
{
|
||||
newApiServer,
|
||||
},
|
||||
);
|
||||
} catch (error) {
|
||||
logger.error(
|
||||
"[AccountViewView] Failed to refresh native fetcher config after API server change:",
|
||||
error,
|
||||
);
|
||||
// Don't throw - API server change should still succeed even if native fetcher refresh fails
|
||||
}
|
||||
}
|
||||
|
||||
async onClickSavePartnerServer(): Promise<void> {
|
||||
|
||||
Reference in New Issue
Block a user