From c46ef8ad4e624d0b8636cf35727208bc7d4e6434 Mon Sep 17 00:00:00 2001
From: nielsandriesse <andriesseniels@gmail.com>
Date: Thu, 30 Jul 2020 09:26:45 +1000
Subject: [PATCH] Fix build

---
 .../fragment_pn_mode_bottom_sheet.xml         | 118 ------------------
 res/layout/fragment_pn_mode_bottom_sheet.xml  | 118 ------------------
 .../securesms/loki/activities/HomeActivity.kt |  15 ---
 .../loki/dialogs/PNModeBottomSheet.kt         | 100 ---------------
 4 files changed, 351 deletions(-)
 delete mode 100644 res/layout-sw400dp/fragment_pn_mode_bottom_sheet.xml
 delete mode 100644 res/layout/fragment_pn_mode_bottom_sheet.xml
 delete mode 100644 src/org/thoughtcrime/securesms/loki/dialogs/PNModeBottomSheet.kt

diff --git a/res/layout-sw400dp/fragment_pn_mode_bottom_sheet.xml b/res/layout-sw400dp/fragment_pn_mode_bottom_sheet.xml
deleted file mode 100644
index 0b01b12fdc..0000000000
--- a/res/layout-sw400dp/fragment_pn_mode_bottom_sheet.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:gravity="center_horizontal"
-    app:behavior_hideable="true"
-    app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior"
-    android:background="@drawable/default_bottom_sheet_background_inset">
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/very_large_spacing"
-        android:layout_marginTop="@dimen/medium_spacing"
-        android:layout_marginRight="@dimen/very_large_spacing"
-        android:textSize="@dimen/very_large_font_size"
-        android:textStyle="bold"
-        android:textColor="@color/text"
-        android:text="@string/sheet_pn_mode_title" />
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/very_large_spacing"
-        android:layout_marginTop="6dp"
-        android:layout_marginRight="@dimen/very_large_spacing"
-        android:textSize="@dimen/medium_font_size"
-        android:textColor="@color/text"
-        android:text="@string/sheet_pn_mode_explanation" />
-
-    <LinearLayout
-        android:id="@+id/fcmOptionView"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/very_large_spacing"
-        android:layout_marginTop="@dimen/medium_spacing"
-        android:layout_marginRight="@dimen/very_large_spacing"
-        android:padding="12dp"
-        android:orientation="vertical"
-        android:background="@drawable/pn_option_background">
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textSize="@dimen/medium_font_size"
-            android:textColor="@color/text"
-            android:textStyle="bold"
-            android:text="@string/sheet_pn_mode_fcm_option_title" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            android:textSize="@dimen/very_small_font_size"
-            android:textColor="@color/text"
-            android:text="@string/sheet_pn_mode_fcm_option_explanation" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            android:textSize="@dimen/very_small_font_size"
-            android:textColor="@color/accent"
-            android:textStyle="bold"
-            android:text="@string/sheet_pn_mode_recommended_option_tag" />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/backgroundPollingOptionView"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/very_large_spacing"
-        android:layout_marginTop="@dimen/small_spacing"
-        android:layout_marginRight="@dimen/very_large_spacing"
-        android:padding="12dp"
-        android:orientation="vertical"
-        android:background="@drawable/pn_option_background">
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textSize="@dimen/medium_font_size"
-            android:textColor="@color/text"
-            android:textStyle="bold"
-            android:text="@string/sheet_pn_mode_background_polling_option_title" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            android:textSize="@dimen/very_small_font_size"
-            android:textColor="@color/text"
-            android:text="@string/sheet_pn_mode_background_polling_option_explanation" />
-
-    </LinearLayout>
-
-    <Button
-        style="@style/MediumProminentOutlineButton"
-        android:id="@+id/confirmButton"
-        android:layout_width="240dp"
-        android:layout_height="@dimen/medium_button_height"
-        android:layout_marginTop="@dimen/medium_spacing"
-        android:text="@string/sheet_pn_mode_confirm_button_title" />
-
-    <Button
-        style="@style/MediumUnimportantOutlineButton"
-        android:id="@+id/skipButton"
-        android:layout_width="240dp"
-        android:layout_height="@dimen/medium_button_height"
-        android:layout_marginTop="@dimen/small_spacing"
-        android:layout_marginBottom="@dimen/medium_spacing"
-        android:text="@string/sheet_pn_mode_skip_button_title" />
-
-</LinearLayout>
diff --git a/res/layout/fragment_pn_mode_bottom_sheet.xml b/res/layout/fragment_pn_mode_bottom_sheet.xml
deleted file mode 100644
index 48fc5f3a31..0000000000
--- a/res/layout/fragment_pn_mode_bottom_sheet.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:gravity="center_horizontal"
-    app:behavior_hideable="true"
-    app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior"
-    android:background="@drawable/default_bottom_sheet_background_inset">
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/very_large_spacing"
-        android:layout_marginTop="@dimen/medium_spacing"
-        android:layout_marginRight="@dimen/very_large_spacing"
-        android:textSize="@dimen/large_font_size"
-        android:textStyle="bold"
-        android:textColor="@color/text"
-        android:text="@string/sheet_pn_mode_title" />
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/very_large_spacing"
-        android:layout_marginTop="6dp"
-        android:layout_marginRight="@dimen/very_large_spacing"
-        android:textSize="@dimen/small_font_size"
-        android:textColor="@color/text"
-        android:text="@string/sheet_pn_mode_explanation" />
-
-    <LinearLayout
-        android:id="@+id/fcmOptionView"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/very_large_spacing"
-        android:layout_marginTop="@dimen/small_spacing"
-        android:layout_marginRight="@dimen/very_large_spacing"
-        android:padding="12dp"
-        android:orientation="vertical"
-        android:background="@drawable/pn_option_background">
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textSize="@dimen/medium_font_size"
-            android:textColor="@color/text"
-            android:textStyle="bold"
-            android:text="@string/sheet_pn_mode_fcm_option_title" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            android:textSize="@dimen/very_small_font_size"
-            android:textColor="@color/text"
-            android:text="@string/sheet_pn_mode_fcm_option_explanation" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            android:textSize="@dimen/very_small_font_size"
-            android:textColor="@color/accent"
-            android:textStyle="bold"
-            android:text="@string/sheet_pn_mode_recommended_option_tag" />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/backgroundPollingOptionView"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/very_large_spacing"
-        android:layout_marginTop="@dimen/small_spacing"
-        android:layout_marginRight="@dimen/very_large_spacing"
-        android:padding="12dp"
-        android:orientation="vertical"
-        android:background="@drawable/pn_option_background">
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textSize="@dimen/medium_font_size"
-            android:textColor="@color/text"
-            android:textStyle="bold"
-            android:text="@string/sheet_pn_mode_background_polling_option_title" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            android:textSize="@dimen/very_small_font_size"
-            android:textColor="@color/text"
-            android:text="@string/sheet_pn_mode_background_polling_option_explanation" />
-
-    </LinearLayout>
-
-    <Button
-        style="@style/MediumProminentOutlineButton"
-        android:id="@+id/confirmButton"
-        android:layout_width="240dp"
-        android:layout_height="@dimen/medium_button_height"
-        android:layout_marginTop="10dp"
-        android:text="@string/sheet_pn_mode_confirm_button_title" />
-
-    <Button
-        style="@style/MediumUnimportantOutlineButton"
-        android:id="@+id/skipButton"
-        android:layout_width="240dp"
-        android:layout_height="@dimen/medium_button_height"
-        android:layout_marginTop="@dimen/small_spacing"
-        android:layout_marginBottom="@dimen/medium_spacing"
-        android:text="@string/sheet_pn_mode_skip_button_title" />
-
-</LinearLayout>
diff --git a/src/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt
index cb9cae4fa4..b4f26eadc0 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt
@@ -31,7 +31,6 @@ import org.thoughtcrime.securesms.database.ThreadDatabase
 import org.thoughtcrime.securesms.database.model.ThreadRecord
 import org.thoughtcrime.securesms.jobs.MultiDeviceBlockedUpdateJob
 import org.thoughtcrime.securesms.loki.dialogs.ConversationOptionsBottomSheet
-import org.thoughtcrime.securesms.loki.dialogs.PNModeBottomSheet
 import org.thoughtcrime.securesms.loki.protocol.ClosedGroupsProtocol
 import org.thoughtcrime.securesms.loki.protocol.SessionResetImplementation
 import org.thoughtcrime.securesms.loki.utilities.*
@@ -190,20 +189,6 @@ class HomeActivity : PassphraseRequiredActionBarActivity, ConversationClickListe
         if (hasViewedSeed || !isMasterDevice) {
             seedReminderView.visibility = View.GONE
         }
-        if (!TextSecurePreferences.hasSeenPNModeSheet(this)) {
-            val bottomSheet = PNModeBottomSheet()
-            bottomSheet.onConfirmTapped = { isUsingFCM ->
-                TextSecurePreferences.setHasSeenPNModeSheet(this, true)
-                TextSecurePreferences.setIsUsingFCM(this, isUsingFCM)
-                ApplicationContext.getInstance(this).registerForFCMIfNeeded(true)
-                bottomSheet.dismiss()
-            }
-            bottomSheet.onSkipTapped = {
-                TextSecurePreferences.setHasSeenPNModeSheet(this, true)
-                bottomSheet.dismiss()
-            }
-            bottomSheet.show(supportFragmentManager, bottomSheet.tag)
-        }
     }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
diff --git a/src/org/thoughtcrime/securesms/loki/dialogs/PNModeBottomSheet.kt b/src/org/thoughtcrime/securesms/loki/dialogs/PNModeBottomSheet.kt
deleted file mode 100644
index 276f81ee43..0000000000
--- a/src/org/thoughtcrime/securesms/loki/dialogs/PNModeBottomSheet.kt
+++ /dev/null
@@ -1,100 +0,0 @@
-package org.thoughtcrime.securesms.loki.dialogs
-
-import android.app.AlertDialog
-import android.content.DialogInterface
-import android.graphics.drawable.TransitionDrawable
-import android.os.Bundle
-import android.support.annotation.DrawableRes
-import android.support.design.widget.BottomSheetDialogFragment
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.LinearLayout
-import kotlinx.android.synthetic.main.fragment_pn_mode_bottom_sheet.*
-import network.loki.messenger.R
-import org.thoughtcrime.securesms.util.TextSecurePreferences
-
-class PNModeBottomSheet : BottomSheetDialogFragment() {
-    private var selectedOptionView: LinearLayout? = null
-    var onConfirmTapped: ((Boolean) -> Unit)? = null
-    var onSkipTapped: (() -> Unit)? = null
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setStyle(STYLE_NORMAL, R.style.SessionBottomSheetDialogTheme)
-    }
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_pn_mode_bottom_sheet, container, false)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        fcmOptionView.setOnClickListener { toggleFCM() }
-        backgroundPollingOptionView.setOnClickListener { toggleBackgroundPolling() }
-        confirmButton.setOnClickListener { confirm() }
-        skipButton.setOnClickListener { onSkipTapped?.invoke() }
-    }
-
-    override fun onDismiss(dialog: DialogInterface?) {
-        TextSecurePreferences.setHasSeenPNModeSheet(context, true)
-        super.onDismiss(dialog)
-    }
-
-    // region Animation
-    private fun performTransition(@DrawableRes transitionID: Int, subject: View) {
-        val drawable = resources.getDrawable(transitionID, context!!.theme) as TransitionDrawable
-        subject.background = drawable
-        drawable.startTransition(250)
-    }
-    // endregion
-
-    // region Interaction
-    private fun toggleFCM() {
-        when (selectedOptionView) {
-            null -> {
-                performTransition(R.drawable.pn_option_background_select_transition, fcmOptionView)
-                selectedOptionView = fcmOptionView
-            }
-            fcmOptionView -> {
-                performTransition(R.drawable.pn_option_background_deselect_transition, fcmOptionView)
-                selectedOptionView = null
-            }
-            backgroundPollingOptionView -> {
-                performTransition(R.drawable.pn_option_background_select_transition, fcmOptionView)
-                performTransition(R.drawable.pn_option_background_deselect_transition, backgroundPollingOptionView)
-                selectedOptionView = fcmOptionView
-            }
-        }
-    }
-
-    private fun toggleBackgroundPolling() {
-        when (selectedOptionView) {
-            null -> {
-                performTransition(R.drawable.pn_option_background_select_transition, backgroundPollingOptionView)
-                selectedOptionView = backgroundPollingOptionView
-            }
-            backgroundPollingOptionView -> {
-                performTransition(R.drawable.pn_option_background_deselect_transition, backgroundPollingOptionView)
-                selectedOptionView = null
-            }
-            fcmOptionView -> {
-                performTransition(R.drawable.pn_option_background_select_transition, backgroundPollingOptionView)
-                performTransition(R.drawable.pn_option_background_deselect_transition, fcmOptionView)
-                selectedOptionView = backgroundPollingOptionView
-            }
-        }
-    }
-
-    private fun confirm() {
-        if (selectedOptionView == null) {
-            val dialog = AlertDialog.Builder(context)
-            dialog.setTitle(R.string.sheet_pn_mode_no_option_picked_dialog_title)
-            dialog.setPositiveButton(R.string.ok) { _, _ -> }
-            dialog.create().show()
-            return
-        }
-        onConfirmTapped?.invoke(selectedOptionView == fcmOptionView)
-    }
-    // endregion
-}
\ No newline at end of file