From 59d20f878966a6ff89ab61289ab521f96abc90a0 Mon Sep 17 00:00:00 2001
From: Alya Sirko <alya@selfprivacy.org>
Date: Tue, 20 Sep 2022 08:43:32 +0300
Subject: [PATCH] Revert "Revert "Rename to org.selfprivacy.app and add
 flavors.""

This reverts commit 77d36a3a6a71284d1847ede65ef57484795520ef.
---
 android/app/build.gradle                      | 21 +++++++++++++++++--
 android/app/src/debug/AndroidManifest.xml     |  2 +-
 android/app/src/main/AndroidManifest.xml      |  2 +-
 .../selfprivacy/app}/MainActivity.kt          |  2 +-
 android/app/src/profile/AndroidManifest.xml   |  2 +-
 linux/CMakeLists.txt                          |  2 +-
 6 files changed, 24 insertions(+), 7 deletions(-)
 rename android/app/src/main/kotlin/{pro/kherel/selfprivacy => org/selfprivacy/app}/MainActivity.kt (75%)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 4d2afc72..c8a562ca 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -26,7 +26,9 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion flutter.compileSdkVersion
+  namespace 'org.selfprivacy.app'
+
+  compileSdkVersion flutter.compileSdkVersion
     ndkVersion flutter.ndkVersion
 
     sourceSets {
@@ -48,7 +50,7 @@ android {
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId "pro.kherel.selfprivacy"
+        applicationId "org.selfprivacy.app"
         minSdkVersion 21
         targetSdkVersion 31
         versionCode flutterVersionCode.toInteger()
@@ -69,6 +71,21 @@ android {
             versionName "nightly-" + project.getVersionCode()
         }
     }
+
+    flavorDimensions "default"
+    productFlavors {
+        fdroid {
+            applicationId "pro.kherel.selfprivacy"
+        }
+        production {
+            applicationIdSuffix ""
+        }
+        nightly {
+            applicationIdSuffix ".nightly"
+            versionCode project.getVersionCode()
+            versionName "nightly-" + project.getVersionCode()
+        }
+    }
 }
 
 flutter {
diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml
index 27e1af1d..dddeb01f 100644
--- a/android/app/src/debug/AndroidManifest.xml
+++ b/android/app/src/debug/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="pro.kherel.selfprivacy">
+    package="org.selfprivacy.app">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 33c2ba9a..50f47475 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="pro.kherel.selfprivacy">
+    package="org.selfprivacy.app">
     <uses-permission android:name="android.permission.INTERNET" />
     <!-- io.flutter.app.FlutterApplication is an android.app.Application that
          calls FlutterMain.startInitialization(this); in its onCreate method.
diff --git a/android/app/src/main/kotlin/pro/kherel/selfprivacy/MainActivity.kt b/android/app/src/main/kotlin/org/selfprivacy/app/MainActivity.kt
similarity index 75%
rename from android/app/src/main/kotlin/pro/kherel/selfprivacy/MainActivity.kt
rename to android/app/src/main/kotlin/org/selfprivacy/app/MainActivity.kt
index f141ec9d..440e86e7 100644
--- a/android/app/src/main/kotlin/pro/kherel/selfprivacy/MainActivity.kt
+++ b/android/app/src/main/kotlin/org/selfprivacy/app/MainActivity.kt
@@ -1,4 +1,4 @@
-package pro.kherel.selfprivacy
+package org.selfprivacy.app
 
 import io.flutter.embedding.android.FlutterActivity
 
diff --git a/android/app/src/profile/AndroidManifest.xml b/android/app/src/profile/AndroidManifest.xml
index 27e1af1d..dddeb01f 100644
--- a/android/app/src/profile/AndroidManifest.xml
+++ b/android/app/src/profile/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="pro.kherel.selfprivacy">
+    package="org.selfprivacy.app">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->
diff --git a/linux/CMakeLists.txt b/linux/CMakeLists.txt
index cc332a28..94dd8d0b 100644
--- a/linux/CMakeLists.txt
+++ b/linux/CMakeLists.txt
@@ -7,7 +7,7 @@ project(runner LANGUAGES CXX)
 set(BINARY_NAME "selfprivacy")
 # The unique GTK application identifier for this application. See:
 # https://wiki.gnome.org/HowDoI/ChooseApplicationID
-set(APPLICATION_ID "pro.kherel.selfprivacy")
+set(APPLICATION_ID "org.selfprivacy.app")
 
 # Explicitly opt in to modern CMake behaviors to avoid warnings with recent
 # versions of CMake.