add permission exception for android < Marshmallow

2 files changed, 18 insertions, 12 deletions

diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
index 6c93a3acc..16d49ccf7 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
@@ -126,6 +126,8 @@ public class ConversationActivity extends XmppActivity
 	private AtomicBoolean mRedirected = new AtomicBoolean(false);
 	private Pair<Integer, Intent> mPostponedActivityResult;
 
+    long FirstStartTime = 0;
+
 	@SuppressLint("NewApi")
 	private static List<Uri> extractUriFromIntent(final Intent intent) {
 		List<Uri> uris = new ArrayList<>();
@@ -1313,11 +1315,16 @@ public class ConversationActivity extends XmppActivity
 		this.xmppConnectionService.getNotificationService().setIsInForeground(true);
 		updateConversationList();
 
-		long FirstStartTime = 0;
-		Bundle extras = getIntent().getExtras();
-			if(extras != null) {
-				FirstStartTime = extras.getLong("FirstStart");
-			}
+        Bundle extras = getIntent().getExtras();
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            if (extras != null) {
+                FirstStartTime = extras.getLong("FirstStart");
+                Log.d(Config.LOGTAG, "Get first start time from StartUI: " + FirstStartTime);
+            }
+        } else {
+            FirstStartTime = System.currentTimeMillis();
+            Log.d(Config.LOGTAG, "Device is running Android < SDK 23, no restart required: " + FirstStartTime);
+        }
 
 		if (mPendingConferenceInvite != null) {
 			mPendingConferenceInvite.execute(this);
diff --git a/src/main/java/eu/siacs/conversations/ui/startUI.java b/src/main/java/eu/siacs/conversations/ui/startUI.java
index e69db94aa..5b919dbad 100644
--- a/src/main/java/eu/siacs/conversations/ui/startUI.java
+++ b/src/main/java/eu/siacs/conversations/ui/startUI.java
@@ -41,22 +41,21 @@ public class startUI extends AppCompatActivity
 
     @AfterPermissionGranted(NeededPermissions)
     private void requestNeededPermissions() {
+        String PREFS_NAME = "FirstStart";
+        SharedPreferences FirstStart = getApplicationContext().getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+        long FirstStartTime = FirstStart.getLong("FirstStart", 0);
         if (EasyPermissions.hasPermissions(this, perms)) {
             // Already have permission, start ConversationsActivity
-            String PREFS_NAME = "FirstStart";
-            SharedPreferences FirstStart = getApplicationContext().getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
-            long FirstStartTime = FirstStart.getLong("FirstStart", 0);
+            Log.d(Config.LOGTAG, "All permissions granted, starting "+getString(R.string.app_name) + "(" +FirstStartTime + ")");
             Intent intent = new Intent (this, ConversationActivity.class);
             intent.putExtra("FirstStart", FirstStartTime);
             startActivity(intent);
             finish();
         } else {
             // set first start to 0 if there are permissions to request
-            String PREFS_NAME = "FirstStart";
-            long FirstStartTime = 0;
-            SharedPreferences FirstStart = getApplicationContext().getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+            Log.d(Config.LOGTAG, "Requesting required permissions");
             SharedPreferences.Editor editor = FirstStart.edit();
-            editor.putLong("FirstStart", FirstStartTime);
+            editor.putLong("FirstStart", 0);
             editor.commit();
             // Do not have permissions, request them now
             EasyPermissions.requestPermissions(this, getString(R.string.request_permissions_message),