From 3ed17fb4029212c609b58928326c0f748212914d Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@madoka.volgo-balt.ru>
Date: Tue, 7 Nov 2017 13:13:21 +0300
Subject: disallow switching to previous activity using back button after going
 online or offline

---
 org.fox.ttrss/src/main/AndroidManifest.xml                        | 4 ++--
 org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java     | 8 ++++----
 .../src/main/java/org/fox/ttrss/offline/OfflineActivity.java      | 7 ++++++-
 3 files changed, 12 insertions(+), 7 deletions(-)

(limited to 'org.fox.ttrss')

diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml
index 7fb2647e..6e41d1ae 100755
--- a/org.fox.ttrss/src/main/AndroidManifest.xml
+++ b/org.fox.ttrss/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.fox.ttrss"
-    android:versionCode="460"
-    android:versionName="1.226">
+    android:versionCode="461"
+    android:versionName="1.227">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java
index 12ae0622..8503bf9a 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java
@@ -255,13 +255,13 @@ public class OnlineActivity extends CommonActivity {
 		editor.apply();
 
 		Intent offline = new Intent(OnlineActivity.this, OfflineActivity.class);
+		offline.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION | Intent.FLAG_ACTIVITY_CLEAR_TASK |
+				Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_TASK);
 		offline.putExtra("initial", true);
-		offline.setFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
-	 	   
-		startActivityForResult(offline, 0);
 
-		finish();
+		startActivity(offline);
 
+		finish();
 	}
 	
 	public void login() {
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java
index ce243d1e..1123ca12 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java
@@ -24,6 +24,7 @@ import android.view.MenuItem;
 import android.widget.EditText;
 
 import org.fox.ttrss.CommonActivity;
+import org.fox.ttrss.OnlineActivity;
 import org.fox.ttrss.PreferencesActivity;
 import org.fox.ttrss.R;
 
@@ -636,8 +637,12 @@ public class OfflineActivity extends CommonActivity {
 		editor.putBoolean("offline_mode_active", false);
 		editor.apply();
 
-		Intent refresh = new Intent(this, org.fox.ttrss.OnlineActivity.class);
+		Intent refresh = new Intent(this, OnlineActivity.class);
+		refresh.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION | Intent.FLAG_ACTIVITY_CLEAR_TASK |
+				Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_TASK);
+
 		startActivity(refresh);
+
 		finish();
 	}
 	
-- 
cgit v1.2.3