Revert "Add PR notice"

This reverts commit 78c66b0.
airmessage · Oct 31, 2022 · 119fdd1 · 119fdd1
1 parent 080f92b
commit 119fdd1
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 64 deletions.
diff --git a/app/src/main/java/me/tagavari/airmessage/activity/Conversations.java b/app/src/main/java/me/tagavari/airmessage/activity/Conversations.java
@@ -114,7 +114,7 @@ public class Conversations extends AppCompatCompositeActivity {
 
 	//Creating the view model and info bar values
 	private ActivityViewModel viewModel;
-	private PluginMessageBar.InfoBar infoBarConnection, infoBarContacts, infoBarServerUpdate, infoBarServerUpdateRequired, infoBarSecurityUpdate, infoBarPR;
+	private PluginMessageBar.InfoBar infoBarConnection, infoBarContacts, infoBarServerUpdate, infoBarServerUpdateRequired, infoBarSecurityUpdate;
 
 	//Creating the menu values
 	private MenuItem menuItemMarkAllRead = null;
@@ -312,12 +312,6 @@ public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
 		infoBarServerUpdateRequired.setButton(R.string.action_details, view -> showServerUpdateRequiredDialog());
 		infoBarSecurityUpdate = pluginMessageBar.create(R.drawable.lock_alert, getResources().getString(R.string.message_securityupdate));
 		infoBarSecurityUpdate.setButton(R.string.action_resolve, view -> PlaySecurityBridge.showDialog(this, viewModel.playServicesErrorCode.getValue(), activityResultPlayServices));
-		infoBarPR = pluginMessageBar.create(R.drawable.feedback, getResources().getString(R.string.message_freeimessage_title));
-		infoBarPR.setButton(R.string.action_details, view -> showPRDialog());
-
-		if(!SharedPreferencesManager.getPRDismissed(this)) {
-			infoBarPR.show();
-		}
 
 		//Configuring the normal / archived view
 		if(isViewArchived) {
@@ -871,26 +865,6 @@ private void showServerUpdateRequiredDialog() {
 				.show();
 	}
 
-	/**
-	 * Shows a dialog that informs the user of AirMessage's PR
-	 */
-	private void showPRDialog() {
-		new MaterialAlertDialogBuilder(this)
-				.setTitle(R.string.message_freeimessage_title)
-				.setMessage(R.string.message_freeimessage_description)
-				.setPositiveButton(R.string.action_helpthecause, (dialog, which) -> {
-					Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://airmessage.org/free-imessage"));
-					startActivity(browserIntent);
-				})
-				.setNeutralButton(android.R.string.cancel, (dialog, which) -> dialog.dismiss())
-				.setNegativeButton(R.string.action_dontshowagain, (dialog, which) -> {
-					SharedPreferencesManager.setPRDismissed(this, true);
-					infoBarPR.hide();
-				})
-				.create()
-				.show();
-	}
-
 	/**
 	 * Updates the conversation list in response to a messaging event
 	 */

diff --git a/app/src/main/java/me/tagavari/airmessage/data/SharedPreferencesManager.kt b/app/src/main/java/me/tagavari/airmessage/data/SharedPreferencesManager.kt
@@ -21,7 +21,6 @@ object SharedPreferencesManager {
 	private const val sharedPreferencesDefaultKeySchemaVersion = "schema_version"
 	private const val sharedPreferencesDefaultKeyInstallationID = "installation_id"
 
-	private const val sharedPreferencesDefaultKey2208PRDismiss = "22_08_pr_dismiss" //Whether the user dismissed the PR
 	private const val sharedPreferencesDefaultUserName = "user_name" //A cached value of the server's user name
 	private const val sharedPreferencesDefaultServerSupportsFaceTime = "server_supports_facetime" //A cached value of whether the server supports FaceTime
 
@@ -298,16 +297,6 @@ object SharedPreferencesManager {
 		return installationID
 	}
 
-	@JvmStatic
-	fun getPRDismissed(context: Context): Boolean {
-		return getInstallationSharedPrefs(context).getBoolean(sharedPreferencesDefaultKey2208PRDismiss, false)
-	}
-
-	@JvmStatic
-	fun setPRDismissed(context: Context, prDismissed: Boolean) {
-		getInstallationSharedPrefs(context).edit().putBoolean(sharedPreferencesDefaultKey2208PRDismiss, prDismissed).apply()
-	}
-
 	@JvmStatic
 	fun getServerUserName(context: Context): String {
 		return getInstallationSharedPrefs(context).getString(sharedPreferencesDefaultUserName, "User")!!

diff --git a/app/src/main/res/drawable/feedback.xml b/app/src/main/res/drawable/feedback.xml
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
@@ -562,10 +562,4 @@
 	<string name="error_badmembers">Les participants ne sont pas disponibles sur FaceTime</string>
 	<string name="notificationchannel_incomingcall">Appels entrants</string>
 	<string name="notificationchannel_incomingcall_desc">Notifications concernant les appels FaceTime entrants</string>
-
-	<string name="action_dontshowagain">Ne plus afficher</string>
-	<string name="action_helpthecause">Soutenir la cause</string>
-
-	<string name="message_freeimessage_title">Libérons iMessage - #FreeiMessage</string>
-	<string name="message_freeimessage_description">iMessage a toujours été limité aux plates-formes Apple, perturbant la communication et dégradant les expériences des utilisateurs Apple, ainsi que des utilisateurs Android et Windows.\n\nNous méritons mieux.\n\niMessage mérite d\'être un écosystème ouvert.\n\nAidez-nous à le faire savoir à Tim Cook et à Apple.</string>
 </resources>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
@@ -553,10 +553,4 @@
 	<string name="error_badmembers">参加者は FaceTime では利用できません</string>
 	<string name="notificationchannel_incomingcall">着信</string>
 	<string name="notificationchannel_incomingcall_desc">FaceTime 通話の着信に関する通知</string>
-
-	<string name="action_dontshowagain">今後表示しない</string>
-	<string name="action_helpthecause">支援する</string>
-
-	<string name="message_freeimessage_title">iMessage を解放しましょう - #FreeiMessage</string>
-	<string name="message_freeimessage_description">iMessage は常に Apple のプラットフォームにロックダウンされており、コミュニケーションを妨害し、Apple のユーザーだけでなく、Android および Windows のユーザーのエクスペリエンスを低下させてきました。\n\nもっと良い待遇を受けるべきです。\n\niMessage はオープンなエコシステムであるべきです。\n\nTim Cook と Apple に知らせるために、ご協力ください。</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -87,8 +87,6 @@
 	<string name="action_answercall">Answer</string>
 	<string name="action_declinecall">Decline</string>
 	<string name="action_endcall">End call</string>
-	<string name="action_dontshowagain">Don\'t show again</string>
-	<string name="action_helpthecause">Help the cause</string>
 
 	<!-- Short actions are infinitive constructs with no verbs (picture -> take a picture) -->
 	<string name="action_short_picture">Photo</string>
@@ -198,9 +196,6 @@
 	<string name="message_permissiondetails_microphone_failedrequest">AirMessage must be able to record audio to send audio messages</string>
 
 	<string name="message_textmessageimport">Started importing text messages</string>
-
-	<string name="message_freeimessage_title">Let\'s free iMessage - #FreeiMessage</string>
-	<string name="message_freeimessage_description">iMessage has always been locked down to Apple platforms, disrupting the communication and degrading the experiences of Apple users, as well as Android and Windows users.\n\nWe deserve better.\n\niMessage deserves to be an open ecosystem.\n\nHelp us let Tim Cook and Apple know.</string>
 
 	<string name="message_serverstatus_limitedfunctionality">%s. Functionality will be limited.</string>
 	<string name="message_serverstatus_noconnection">No connection to server</string>