rhodes 6.2.0 → 7.1.17

data/lib/commonAPI/coreapi/ext/platform/android/ext_java.files

@@ -37,6 +37,8 @@ ext/platform/android/src/com/rho/notification/NotificationFactory.java
 ext/platform/android/src/com/rho/notification/NotificationSingleton.java
 ext/platform/android/src/com/rho/notification/Notification.java
 ext/platform/android/src/com/rho/notification/NotificationIntentService.java
+ext/platform/android/src/com/rho/notification/NotificationScheduler.java
+ext/platform/android/src/com/rho/notification/AlarmReceiver.java
 ext/platform/android/generated/src/com/rho/intent/IntentBase.java
 ext/platform/android/generated/src/com/rho/intent/IntentFactorySingleton.java
 ext/platform/android/generated/src/com/rho/intent/IntentSingletonBase.java

data/lib/commonAPI/coreapi/ext/platform/android/src/com/rho/notification/AlarmReceiver.java

@@ -0,0 +1,27 @@
+package com.rho.notification;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import com.rhomobile.rhodes.Logger;
+import com.rhomobile.rhodes.RhodesActivity;
+
+public class AlarmReceiver extends BroadcastReceiver {
+
+    String TAG = "AlarmReceiver";
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        if (intent.getAction() != null && context != null) {
+            if (intent.getAction().equalsIgnoreCase(Intent.ACTION_BOOT_COMPLETED)) {
+                NotificationScheduler.getSchedulerSettings(context);
+                NotificationScheduler.setReminder(context, AlarmReceiver.class);
+                return;
+            }
+        }
+
+        Logger.D(TAG, "onAlarmReceive: ");
+        NotificationScheduler.showNotification(context, RhodesActivity.class);
+
+    }
+}

data/lib/commonAPI/coreapi/ext/platform/android/src/com/rho/notification/Notification.java

@@ -8,6 +8,9 @@ import java.util.Map;
 
 import android.app.Dialog;
 import android.app.NotificationManager;
+
+import com.rhomobile.rhodes.osfunctionality.AndroidFunctionalityManager;
+
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
@@ -15,7 +18,7 @@ import android.content.res.Resources;
 import android.graphics.BitmapFactory;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
-import android.support.v4.app.NotificationCompat;
+import android.app.Notification.Builder;
 import android.view.Gravity;
 import android.view.View;
 import android.view.Window;
@@ -36,12 +39,16 @@ import com.rhomobile.rhodes.file.RhoFileApi;
 import com.rhomobile.rhodes.util.ContextFactory;
 import com.rhomobile.rhodes.util.PerformOnUiThread;
 
+import android.annotation.TargetApi;
+
 public class Notification {
     private static final String TAG = Notification.class.getSimpleName();
 
     private static final int DLG_MAIN_VIEW_ID = 1;
     
     static final String NOTIFICATION_ID = "nitification_id";
+    static final String NOTIFICATION_CHANEL_ID = "rho_notification_chanel_id";
+    static final String NOTIFICATION_CHANEL_NAME = "Rhodes notifications chanel";
 
     int id;
     IMethodResult result;
@@ -50,15 +57,19 @@ public class Notification {
     ArrayList<ActionData> actions = new ArrayList<ActionData>();
     int iconResourceId;
     String iconPath;
-    List<String> kinds = new ArrayList<String>();;
+    List<String> kinds = new ArrayList<String>();
+    Context ctx = null;
     
     Dialog dialog;
 
-    public Notification(int id, Map<String, Object> props, IMethodResult result) {
+    public Notification(int id, Map<String, Object> props, IMethodResult result, Context c) {
         this.id = id;
         this.result = result;
         
-        Context ctx = ContextFactory.getUiContext();
+        if(c == null)
+            ctx = ContextFactory.getUiContext();
+        else
+            ctx = c;
         
         String iconName = null;
 
@@ -175,7 +186,8 @@ public class Notification {
         
         Logger.T(TAG, "Dialog: title: " + title + ", message: " + message + ", buttons: " + actions.size());
         
-        Context ctx = ContextFactory.getUiContext();
+        if(ctx == null)        
+           ctx = ContextFactory.getUiContext();
         int nTopPadding = 10;
 
         dialog = new Dialog(ctx);
@@ -277,8 +289,11 @@ public class Notification {
     public void showNotification() {
         Logger.T(TAG, "Notification: title: " + title + ", message: " + message);
         
-        Context ctx = ContextFactory.getContext();
-        NotificationCompat.Builder builder = new NotificationCompat.Builder(ctx);
+        if(ctx == null) ctx = ContextFactory.getContext();
+
+
+        Builder builder = AndroidFunctionalityManager.getAndroidFunctionality().getNotificationBuilder(ctx,NOTIFICATION_CHANEL_ID,NOTIFICATION_CHANEL_NAME);
+
         builder.setTicker(message);
         if (title != null) {
             builder.setContentTitle(title);
@@ -306,7 +321,9 @@ public class Notification {
 
         builder.setSmallIcon(R.drawable.ic_notification);
         builder.setContentIntent(PendingIntent.getActivity(ctx, id, new Intent(ctx, RhodesActivity.class), PendingIntent.FLAG_UPDATE_CURRENT));
-        
+
+        builder.setDefaults(android.app.Notification.DEFAULT_VIBRATE | android.app.Notification.DEFAULT_SOUND);
+
         if (kinds.contains(INotificationSingleton.TYPE_NOTIFICATION_DIALOG)) {
             for (ActionData action: actions) {
                 
@@ -374,7 +391,8 @@ public class Notification {
             });
         }
 
-        Context ctx = ContextFactory.getContext();
+        if(ctx == null)
+            ctx = ContextFactory.getContext();
         NotificationManager notificationManager = (NotificationManager) ctx.getSystemService(Context.NOTIFICATION_SERVICE);
         notificationManager.cancel(id);
     }
@@ -398,7 +416,7 @@ public class Notification {
     }
     
     public boolean isNotificationAreaNeeded() {
-        return !RhodesApplication.canHandleNow(RhodesApplication.AppState.AppActivated) && (kinds.contains(INotificationSingleton.TYPE_NOTIFICATION) || kinds.contains(INotificationSingleton.TYPE_NOTIFICATION_DIALOG));
+        return (kinds.contains(INotificationSingleton.TYPE_NOTIFICATION) || kinds.contains(INotificationSingleton.TYPE_NOTIFICATION_DIALOG));
     }
 
     private static class ActionData

data/lib/commonAPI/coreapi/ext/platform/android/src/com/rho/notification/NotificationFactory.java

@@ -8,6 +8,10 @@ import com.rhomobile.rhodes.extmanager.AbstractRhoListener;
 import com.rhomobile.rhodes.extmanager.IRhoExtManager;
 import com.rhomobile.rhodes.extmanager.IRhoListener;
 
+import android.content.Context;
+import android.content.Intent;
+
+
 public class NotificationFactory extends AbstractRhoListener implements INotificationFactory, IRhoListener
 {
 	private NotificationSingleton singleton;
@@ -19,6 +23,8 @@ public class NotificationFactory extends AbstractRhoListener implements INotific
 	@Override
 	public INotificationSingleton getApiSingleton()
 	{
+		if(NotificationScheduler.singleton != null)
+			singleton = NotificationScheduler.singleton;
 		if(singleton == null) singleton = new NotificationSingleton();
 		return singleton;
 	}
@@ -56,9 +62,16 @@ public class NotificationFactory extends AbstractRhoListener implements INotific
 		}
 	}
 
+	@Override
+    public void onCreate(RhodesActivity activity, Intent intent) {
+		NotificationScheduler.singleton = (NotificationSingleton)getApiSingleton();
+		NotificationScheduler.activity = activity;
+    }
+
     @Override
     public void onCreateApplication(IRhoExtManager extManager) {
         NotificationFactorySingleton.setInstance(this);
-        extManager.addRhoListener(this);
+		extManager.addRhoListener(this);
+		
     }
 }

data/lib/commonAPI/coreapi/ext/platform/android/src/com/rho/notification/NotificationScheduler.java

@@ -0,0 +1,260 @@
+package com.rho.notification;
+
+import com.rhomobile.rhodes.RhodesActivity;
+import com.rhomobile.rhodes.api.IMethodResult;
+import com.rhomobile.rhodes.api.MethodResult;
+
+import android.app.AlarmManager;
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+
+import java.util.Calendar;
+import com.rhomobile.rhodes.Logger;
+import android.os.SystemClock;
+
+import android.net.Uri;
+import android.support.v4.app.NotificationCompat;
+import android.support.v4.app.TaskStackBuilder;
+import android.media.RingtoneManager;
+import android.content.SharedPreferences;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.List;
+import java.util.ArrayList;
+
+import static android.content.Context.ALARM_SERVICE;
+
+public class NotificationScheduler {
+    public static final int RHO_NOTIFICATION_CODE = 100;
+    public static final String TAG = "NotificationScheduler";
+
+    public static NotificationSingleton singleton = null;
+    public static RhodesActivity activity = null;
+
+    private static String title = null;
+    private static String message = null;
+    private static int interval = 0;
+    private static Boolean repeats = false;
+    private static final String storage_name = "rho_notification_storage";
+    private static int hour = -1, minute = -1, seconds = -1;
+
+    private static Boolean checkTime() {
+        return (hour >= 0 && hour <= 23) && (minute >= 0 && minute <= 59) && (seconds >= 0 && seconds <= 59);
+    }
+
+    private static Boolean isCurrentTime() {
+        return hour == -1 || minute == -1 || seconds == -1;
+    }
+
+    public static void setReminderEx(Map<String, Object> propertyMap, IMethodResult result) {
+        Object titleObj = propertyMap.get(NotificationSingleton.HK_TITLE);
+        if (titleObj != null && (titleObj instanceof String))
+            title = (String) titleObj;
+
+        Object messageObj = propertyMap.get(NotificationSingleton.HK_MESSAGE);
+        if (messageObj != null && (messageObj instanceof String))
+            message = (String) messageObj;
+
+        Object intervalObj = propertyMap.get(NotificationSingleton.HK_INTERVAL);
+        if (intervalObj != null && (intervalObj instanceof Integer))
+            interval = (Integer) intervalObj;
+
+        Object repeatObj = propertyMap.get(NotificationSingleton.HK_REPEATS);
+        if (repeatObj != null && (repeatObj instanceof Boolean))
+            repeats = (Boolean) repeatObj;
+
+        Object startObj = propertyMap.get(NotificationSingleton.HK_START);
+        if (startObj != null && (startObj instanceof Map<?, ?>)) {
+            Map<String, Object> timeMap = (Map<String, Object>) startObj;
+            Object hourObj = timeMap.get(NotificationSingleton.HK_HOUR);
+            if (hourObj != null && (hourObj instanceof Integer))
+                hour = (Integer) hourObj;
+            else
+                hour = -1;
+
+            Object minuteObj = timeMap.get(NotificationSingleton.HK_MINUTE);
+            if (minuteObj != null && (minuteObj instanceof Integer))
+                minute = (Integer) minuteObj;
+            else
+                minute = -1;
+
+            Object secondObj = timeMap.get(NotificationSingleton.HK_SECONDS);
+            if (secondObj != null && (secondObj instanceof Integer))
+                seconds = (Integer) secondObj;
+            else
+                seconds = -1;
+        }
+
+        SharedPreferences settings = activity.getSharedPreferences(storage_name, Context.MODE_PRIVATE);
+        SharedPreferences.Editor editor = settings.edit();
+
+        editor.putString(NotificationSingleton.HK_TITLE, title);
+        editor.putString(NotificationSingleton.HK_MESSAGE, message);
+        editor.putInt(NotificationSingleton.HK_HOUR, hour);
+        editor.putInt(NotificationSingleton.HK_MINUTE, minute);
+        editor.putInt(NotificationSingleton.HK_SECONDS, seconds);
+        if (interval > 0)
+            editor.putInt(NotificationSingleton.HK_INTERVAL, interval);
+        if (repeats)
+            editor.putBoolean(NotificationSingleton.HK_REPEATS, repeats);
+
+        if (editor.commit()) {
+            Logger.I(TAG, "Key is successfully saved to Shared Preferences");
+        } else {
+            Logger.E(TAG, "Write key to Shared Preferences is failed");
+        }
+
+        NotificationScheduler.setReminder(activity, AlarmReceiver.class);
+    }
+
+    public static void getSchedulerSettings(Context context) {
+        try {
+
+            SharedPreferences settings = context.getSharedPreferences(storage_name, Context.MODE_PRIVATE);
+
+            String deadValue = "not exists";
+            int deadInt = -1;
+
+            title = settings.getString(NotificationSingleton.HK_TITLE, deadValue);
+            if (title == deadValue) {
+                title = null;
+                Logger.E(TAG, "Key - HK_TITLE not found!");
+            }
+
+            message = settings.getString(NotificationSingleton.HK_MESSAGE, deadValue);
+            if (message == deadValue) {
+                message = null;
+                Logger.E(TAG, "Key - HK_MESSAGE not found!");
+            }
+
+            interval = settings.getInt(NotificationSingleton.HK_INTERVAL, deadInt);
+            if (interval == deadInt) {
+                interval = 0;
+                Logger.I(TAG, "Key - HK_INTERVAL not found!");
+            }
+
+            repeats = settings.getBoolean(NotificationSingleton.HK_REPEATS, false);
+            hour = settings.getInt(NotificationSingleton.HK_HOUR, deadInt);
+            seconds = settings.getInt(NotificationSingleton.HK_SECONDS, deadInt);
+            minute = settings.getInt(NotificationSingleton.HK_MINUTE, deadInt);
+        } catch (ClassCastException e) {
+            message = null;
+            title = null;
+            Logger.E(TAG, e.getMessage());
+        }
+
+    }
+
+    public static void setReminder(Context context, Class<?> cls) {
+        Calendar now = Calendar.getInstance();
+        Calendar target = Calendar.getInstance();
+
+        if (!isCurrentTime()) {
+            target.set(Calendar.HOUR_OF_DAY, hour);
+            target.set(Calendar.MINUTE, minute);
+            target.set(Calendar.SECOND, seconds);
+
+            if (target.before(now))
+                target.add(Calendar.DATE, 1);
+
+        }
+
+        cancelReminder(context, cls);
+
+        ComponentName receiver = new ComponentName(context, cls);
+        PackageManager pm = context.getPackageManager();
+
+        pm.setComponentEnabledSetting(receiver, PackageManager.COMPONENT_ENABLED_STATE_ENABLED,
+                PackageManager.DONT_KILL_APP);
+
+        Intent new_intent = new Intent(context, cls);
+        PendingIntent pendingIntent = PendingIntent.getBroadcast(context, RHO_NOTIFICATION_CODE, new_intent,
+                PendingIntent.FLAG_UPDATE_CURRENT);
+        AlarmManager am = (AlarmManager) context.getSystemService(ALARM_SERVICE);
+
+        if (interval < 0) {
+            Logger.E(TAG, "Interval is negative!!! Ignore...");
+            interval = 0;
+        }
+
+        if (isCurrentTime()) {
+
+            Logger.I(TAG, "Scheduling: " + "mode - ELAPSED_REALTIME_WAKEUP, interval - " + Integer.toString(interval));
+
+            am.setRepeating(AlarmManager.ELAPSED_REALTIME_WAKEUP, SystemClock.elapsedRealtime() + (interval * 1000),
+                    repeats ? (interval * 1000) : 0, pendingIntent);
+        } else {
+            Logger.I(TAG,
+                    "Scheduling: " + "mode - RTC_WAKEUP, time - " + Integer.toString(target.get(Calendar.HOUR_OF_DAY))
+                            + ":" + Integer.toString(target.get(Calendar.MINUTE)) + ":"
+                            + Integer.toString(target.get(Calendar.SECOND)));
+
+            if (checkTime()) {
+                am.setRepeating(AlarmManager.RTC_WAKEUP, target.getTimeInMillis(), repeats ? (interval * 1000) : 0,
+                        pendingIntent);
+            } else {
+                Logger.E(TAG, "Ivalid parameter for time!!!");
+            }
+        }
+
+    }
+
+    public static void cancelReminderEx() {
+        if (activity != null)
+            cancelReminder(activity, AlarmReceiver.class);
+    }
+
+    public static void cancelReminder(Context context, Class<?> cls) {
+        ComponentName receiver = new ComponentName(context, cls);
+        PackageManager pm = context.getPackageManager();
+
+        pm.setComponentEnabledSetting(receiver, PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
+                PackageManager.DONT_KILL_APP);
+
+        Intent new_intent = new Intent(context, cls);
+        PendingIntent pendingIntent = PendingIntent.getBroadcast(context, RHO_NOTIFICATION_CODE, new_intent,
+                PendingIntent.FLAG_UPDATE_CURRENT);
+        AlarmManager am = (AlarmManager) context.getSystemService(ALARM_SERVICE);
+        am.cancel(pendingIntent);
+        pendingIntent.cancel();
+    }
+
+    public static void showNotification(Context context, Class<?> cls) {
+        Map<String, Object> props = new HashMap<String, Object>();
+
+        if (title == null || message == null) {
+            getSchedulerSettings(context); //try getting settings
+            if(title == null || message == null)
+            {
+               Logger.E(TAG, "Title and message must be set!!!");
+               return;
+            }
+        }
+
+        props.put(NotificationSingleton.HK_TITLE, title);
+        props.put(NotificationSingleton.HK_MESSAGE, message);
+
+        List<String> kinds = new ArrayList<String>();
+        kinds.add(INotificationSingleton.TYPE_NOTIFICATION_DIALOG);
+
+        props.put(NotificationSingleton.HK_TYPES, kinds);
+
+        if (singleton == null) {
+            singleton = new NotificationSingleton();
+            singleton.setContext(context);
+        }
+        singleton.showPopup(props, null);
+
+        if (repeats && interval == 0) {
+            setReminder(context, cls);
+        }
+
+        Logger.I(TAG, "Notification recived!!!");
+    }
+}

data/lib/commonAPI/coreapi/ext/platform/android/src/com/rho/notification/NotificationSingleton.java

@@ -45,6 +45,8 @@ import com.rhomobile.rhodes.file.RhoFileApi;
 import com.rhomobile.rhodes.util.ContextFactory;
 import com.rhomobile.rhodes.util.PerformOnUiThread;
 
+
+
 /**
  * Singleton for the Notification extension. Holds all of the implementation for this extension.
  * Uses code from both RhoElements2 and Rhodes3
@@ -63,6 +65,26 @@ public class NotificationSingleton implements INotificationSingleton
     protected AudioTrack audioTrack = null;
 	private Vibrator vibrator;
 	private MediaPlayer currentMP;
+	private Context ctx = null;
+
+	public void setContext(Context c)
+	{
+		ctx = c;
+	}
+
+	@Override
+	public void setScheduler(final Map<String, Object> propertyMap, final IMethodResult result)
+	{
+		Logger.T(TAG, "setScheduler");
+		NotificationScheduler.setReminderEx(propertyMap, result);
+	}
+
+	@Override
+	public void removeScheduler(final IMethodResult result)
+	{
+		Logger.T(TAG, "removeScheduler");
+		NotificationScheduler.cancelReminderEx();	
+	}
 
     @Override
     public void showPopup(final Map<String, Object> propertyMap, final IMethodResult result) {
@@ -74,7 +96,7 @@ public class NotificationSingleton implements INotificationSingleton
             
             Logger.T(TAG, "Add notification: " + lastNotificationId);
             
-            notification = new Notification(lastNotificationId, propertyMap, result);
+            notification = new Notification(lastNotificationId, propertyMap, result, ctx);
             notifications.append(lastNotificationId, notification);
         }