status-im
/
status-react
mirror of https://github.com/status-im/status-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix App getting stucked on logout (#13427) 

1bfde4c4...869942c0
This commit is contained in:
Parvesh Monu 2022-06-02 22:38:48 +05:30 committed by GitHub
parent b3a74ad7a5
commit 12437e6b7c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
android/app/src/main/res/values-night/colors.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<color name="alert_background">#141414</color> <color name="alert_background">#141414</color>
<color name="alert_text">#ffffff</color> <color name="alert_text">#ffffff</color>
</resources> </resources>

6
android/app/src/main/res/values/styles.xml
View File

@ -24,8 +24,8 @@
</style> </style>
<style name="AlertDialogTheme" parent="Theme.AppCompat.DayNight.Dialog.Alert"> <style name="AlertDialogTheme" parent="Theme.AppCompat.DayNight.Dialog.Alert">
<item name="android:textColor">@color/alert_text</item> <item name="android:textColor">@color/alert_text</item>
<item name="android:textColorPrimary">@color/alert_text</item> <item name="android:textColorPrimary">@color/alert_text</item>
<item name="android:background">@color/alert_background</item> <item name="android:background">@color/alert_background</item>
</style> </style>
</resources> </resources>

22
modules/react-native-status/android/src/main/java/im/status/ethereum/module/StatusModule.java
View File

@ -403,12 +403,24 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
@ReactMethod @ReactMethod
public void logout() { public void logout() {
Log.d(TAG, "logout"); Log.d(TAG, "logout");
String result = Statusgo.logout(); if (!checkAvailability()) {
if (result.startsWith("{\"error\":\"\"")) { System.exit(0);
Log.d(TAG, "Logout result: " + result); return;
} else {
Log.e(TAG, "Logout failed: " + result);
} }
Runnable r = new Runnable() {
@Override
public void run() {
String result = Statusgo.logout();
if (result.startsWith("{\"error\":\"\"")) {
Log.d(TAG, "Logout result: " + result);
} else {
Log.e(TAG, "Logout failed: " + result);
}
}
};
StatusThreadPoolExecutor.getInstance().execute(r);
} }
private void deleteDirectory(File folder) { private void deleteDirectory(File folder) {

2
modules/react-native-status/android/src/main/java/im/status/ethereum/pushnotifications/PushNotification.java
View File

@ -126,7 +126,7 @@ public class PushNotification extends ReactContextBaseJavaModule implements Acti
@ReactMethod @ReactMethod
public void clearAllMessageNotifications() { public void clearAllMessageNotifications() {
pushNotificationHelper.clearAllMessageNotifications(); pushNotificationHelper.clearAllMessageNotifications();
} }
@ReactMethod @ReactMethod

2
modules/react-native-status/android/src/main/java/im/status/ethereum/pushnotifications/PushNotificationHelper.java
View File

@ -200,7 +200,7 @@ public class PushNotificationHelper {
} }
public void clearAllMessageNotifications() { public void clearAllMessageNotifications() {
notificationManager.cancelAll(); notificationManager.cancelAll();
} }
public void sendToNotificationCentreWithPicture(final Bundle bundle, Bitmap largeIconBitmap, Bitmap bigPictureBitmap) { public void sendToNotificationCentreWithPicture(final Bundle bundle, Bitmap largeIconBitmap, Bitmap bigPictureBitmap) {

6
status-go-version.json
View File

@ -3,7 +3,7 @@
"_comment": "Instead use: scripts/update-status-go.sh <rev>", "_comment": "Instead use: scripts/update-status-go.sh <rev>",
"owner": "status-im", "owner": "status-im",
"repo": "status-go", "repo": "status-go",
"version": "v0.100.0", "version": "v0.100.1",
"commit-sha1": "1bfde4c4cc69292875ae9fdc41a8b4bd29e95a7a", "commit-sha1": "869942c05e04fa6e5d5105d3f5642f6a5ff28fcb",
"src-sha256": "1nkk7dsqz1x31n305p33jdwpqr9bm7ajkqs3khq5l4ag3njagbrh" "src-sha256": "0krig4rggbd6aryczig4r70fcn8fmfki52s931zyn3nqmjr386xh"
} }