Merge branch 'release/3.0.3'

Author: jun0813

TMessagesProj/TMessagesProj-3.0.3-release.apk

@@ -76,6 +76,6 @@ android {
         minSdkVersion 9
         targetSdkVersion 22
         versionCode 572
-        versionName "3.0.2"
+        versionName "3.0.3"
     }
 }

TMessagesProj/build.gradle

@@ -46,8 +46,10 @@
 import org.telegramsecureplus.ui.LaunchActivity;
 import org.telegramsecureplus.ui.PopupNotificationActivity;
 
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 
@@ -338,14 +340,19 @@ public void scheduleDeleteMessageRepeat() {
             SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE);
             int minutes = preferences.getInt("repeat_delete_time", 0);
             if (minutes > 0) {
-                Log.d("NotificationsController::scheduleDeleteMessageRepeat", "minutes = " + minutes);
                 alarmManager.cancel(pintent);
-                alarmManager.setInexactRepeating(AlarmManager.ELAPSED_REALTIME_WAKEUP, SystemClock.elapsedRealtime() + minutes * 60 * 1000 , minutes * 60 * 1000, pintent);
+                long now = System.currentTimeMillis();
+                Date date = new Date(now + minutes * 60 * 1000);
+
+                Log.d("NotificationsController::scheduleDeleteMessageRepeat", "minutes = " + minutes + " now=" + date.toString());
+                //alarmManager.setInexactRepeating(AlarmManager.ELAPSED_REALTIME_WAKEUP, SystemClock.elapsedRealtime() + minutes * 60 * 1000 , minutes * 60 * 1000, pintent);
+                alarmManager.setInexactRepeating(AlarmManager.RTC_WAKEUP, date.getTime(), minutes * 60 * 1000, pintent);
             } else {
                 alarmManager.cancel(pintent);
             }
         } catch (Exception e) {
             FileLog.e("tmessages", e);
+            e.printStackTrace();
         }
 
     }

TMessagesProj/src/main/java/org/telegramsecureplus/android/NotificationsController.java

@@ -228,6 +228,8 @@ public static void startPushService() {
                 PendingIntent pintent = PendingIntent.getService(applicationContext, 0, new Intent(applicationContext, NotificationsService.class), 0);
                 AlarmManager alarm = (AlarmManager)applicationContext.getSystemService(Context.ALARM_SERVICE);
                 alarm.cancel(pintent);
+
+                NotificationsController.getInstance().scheduleDeleteMessageRepeat();
             }
         } else {
             stopPushService();