fix exceptions in register.php

android/app/src/main/AndroidManifest.xml

@@ -62,7 +62,7 @@
             android:name=".view.debug.QueryLogActivity"
             android:label="@string/title_activity_query_log"
             android:theme="@style/AppTheme" />
-        <activity android:name=".view.debug.SingleQueryLogActivity"></activity>
+        <activity android:name=".view.debug.SingleQueryLogActivity" />
     </application>
 
 </manifest>

android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/service/NotificationService.java

@@ -229,10 +229,10 @@ public class NotificationService
         if (msg.Priority == PriorityEnum.NORMAL) mBuilder.setPriority(NotificationCompat.PRIORITY_DEFAULT);
         if (msg.Priority == PriorityEnum.HIGH)   mBuilder.setPriority(NotificationCompat.PRIORITY_HIGH);
 
-        Intent intnt_click = new Intent(SCNApp.getContext(), BroadcastReceiverService.class);
+        Intent intent = new Intent(ctxt, MainActivity.class);
-        intnt_click.putExtra(BroadcastReceiverService.ID_KEY, BroadcastReceiverService.NOTIF_SHOW_MAIN);
+        PendingIntent pi = PendingIntent.getActivity(ctxt, 0, intent, 0);
-        PendingIntent pi = PendingIntent.getBroadcast(ctxt, 0, intnt_click, 0);
         mBuilder.setContentIntent(pi);
+
         NotificationManager mNotificationManager = (NotificationManager) ctxt.getSystemService(Context.NOTIFICATION_SERVICE);
         if (mNotificationManager == null) return;
 

android/app/version.properties

@@ -1,3 +1,3 @@
-#Fri Dec 14 22:08:16 CET 2018
+#Sun Jan 05 22:18:36 UTC 2020
-VERSION_NAME=1.6.0
+VERSION_NAME=1.7.0
-VERSION_CODE=20
+VERSION_CODE=22

web/api/register.php

@@ -24,17 +24,20 @@ if ($ispro)
 		$pdo->rollBack();
 		die(json_encode(['success' => false, 'message' => 'Purchase token could not be verified']));
 	}
-
-	$stmt = $pdo->prepare('UPDATE users SET is_pro=0, pro_token=NULL WHERE user_id <> :uid AND pro_token = :ptk');
-	$stmt->execute(['uid' => $user_id, 'ptk' => $pro_token]);
 }
 
 $stmt = $pdo->prepare('INSERT INTO users (user_key, fcm_token, is_pro, pro_token, timestamp_accessed) VALUES (:key, :token, :bpro, :spro, NOW())');
-$stmt->execute(['key' => $user_key, 'token' => $fcmtoken, 'bpro' => $ispro, 'spro' => $ispro ? $pro_token : null]);
+$stmt->execute(['key' => $user_key, 'token' => $fcmtoken, 'bpro' => ($ispro ? 1 : 0), 'spro' => ($ispro ? $pro_token : null)]);
 $user_id = $pdo->lastInsertId('user_id');
 
 $stmt = $pdo->prepare('UPDATE users SET fcm_token=NULL WHERE user_id <> :uid AND fcm_token=:ft');
-$stmt->execute(['uid' => $user_id, 'ft' => $fcm_token]);
+$stmt->execute(['uid' => $user_id, 'ft' => $fcmtoken]);
+
+if ($ispro)
+{
+	$stmt = $pdo->prepare('UPDATE users SET is_pro=0, pro_token=NULL WHERE user_id <> :uid AND pro_token = :ptk');
+	$stmt->execute(['uid' => $user_id, 'ptk' => $pro_token]);
+}
 
 $pdo->commit();
 

web/api/schema.sql

@@ -24,7 +24,7 @@ CREATE TABLE `messages`
 	`sender_user_id`     INT(11)         NOT NULL,
 
 	`timestamp_real`     DATETIME        NOT NULL   DEFAULT CURRENT_TIMESTAMP,
-	`ack`                BIT             NOT NULL   DEFAULT 0,
+	`ack`                TINYINT(1)      NOT NULL   DEFAULT 0,
 
 	`title`              VARCHAR(256)    NOT NULL,
 	`content`            VARCHAR(12288)      NULL,