continue

README.md

···
 Licensed under the GNU AGPLv3: https://www.gnu.org/licenses/agpl-3.0.html
 
 Google Play and the Google Play logo are trademarks of Google LLC.
+
+
+//**TM_SA**//
+Signal – New Base-line
+1.	Download the Signal official open source from this link:
+      https://github.com/signalapp/Signal-Android
+
+2.	Rename each folder at the next order:
+      a.	thoughtcrime  tm
+      b.	securesms  archive
+3.	Replace all old package mentions vie “replace all” function (Ctrl +Shift + R)
+      a.	org.thoughtcrime.securesms -> org.tm.archive
+4.	Add our archiver SDK and Common library to new folder “libs” and compile them via dependencies.
+5.	Add archiver,intune,selfauthentication folders with all archiving class with util etc. (Take them from src->main->java->org)
+6.	Search “ArchiveLogger.Companion.sendArchiveLog” in the current project and add all those mentions to the updated project.
+7.	Add launcher icon app and change the round icon path in the manifest
+8.	Add proguard-event_bus from the current project to the updated one.
+9.	Go to the current TeleMessage Signal project and search via ctrl+alt+F : //**TM_SA**//
+
+There are dozens of references to this string please move on the result one by one and replace or add the code with this string ( //**TM_SA**//, in order to create continuation to baseline updating method)
+
+
+intune
+
+1. add dependencies using //**TM_SA**//
+2. add MAMSDK folder with aar and jar
+3. 1. register the app to intune server
+2. https://aad.portal.azure.com/#view/Microsoft_AAD_IAM/ActiveDirectoryMenuBlade/~/Overview3. Azure Active Directory > App registrations > New Registration
+3. Authentication, add platform -> add uri -> package name.
+4. then add auth-config file using the View button that show it. put it in resource-> raw
+5. API permissions...
+
+4. 1. https://aad.portal.azure.com/#view/Microsoft_AAD_IAM/ActiveDirectoryMenuBlade/~/RegisteredApps
+2. then, App configuration policies -> create app configuration policy -> manage apps -> Settings -> add the values(managerID etc)
+3. Then, Assignments -> include groups you want or assign everyone.
+
+5. http://everythingaboutintune.com/2021/07/guide-for-integrating-intune-sdk-and-msal-to-lob-application/
+
+https://www.youtube.com/watch?v=1AyGpcdDRkY&t=741s&ab_channel=EverythingAboutIntune
+
+https://github.com/msintuneappsdk/Taskr-Sample-Intune-Android-App#readme
+//**TM_SA**//

app/jni/Android.mk

···
 LOCAL_CFLAGS     += -Wall
 
 LOCAL_SRC_FILES := $(JNI_DIR)/utils/org_thoughtcrime_securesms_util_FileUtils.cpp
-
+#//**TM_SA**//Start
+LOCAL_SRC_FILES := $(JNI_DIR)/utils/org_tm_archive_util_FileUtils.cpp
+# //**TM_SA**//End
 include $(BUILD_SHARED_LIBRARY)

app/jni/utils/org_thoughtcrime_securesms_util_FileUtils.cpp

···
 #include <unistd.h>
 #include <linux/memfd.h>
 #include <syscall.h>
-
-jint JNICALL Java_org_thoughtcrime_securesms_util_FileUtils_getFileDescriptorOwner
+//**TM_SA**//Change the package name to be our name.
+jint JNICALL Java_org_tm_archive_util_FileUtils_getFileDescriptorOwner
   (JNIEnv *env, jclass clazz, jobject fileDescriptor)
 {
   jclass fdClass = env->GetObjectClass(fileDescriptor);
···
   return stat_struct.st_uid;
 }
 
-JNIEXPORT jint JNICALL Java_org_thoughtcrime_securesms_util_FileUtils_createMemoryFileDescriptor
+//**TM_SA**//Change the package name to be our name.
+JNIEXPORT jint JNICALL Java_org_tm_archive_util_FileUtils_createMemoryFileDescriptor
   (JNIEnv *env, jclass clazz, jstring jname)
 {
   const char *name = env->GetStringUTFChars(jname, NULL);

app/jni/utils/org_thoughtcrime_securesms_util_FileUtils.h

···
  * Method:    getFileDescriptorOwner
  * Signature: (Ljava/io/FileDescriptor;)I
  */
-JNIEXPORT jint JNICALL Java_org_thoughtcrime_securesms_util_FileUtils_getFileDescriptorOwner
+//**TM_SA**//Change the package name to be our name.
+JNIEXPORT jint JNICALL Java_org_tm_archive_util_FileUtils_getFileDescriptorOwner
   (JNIEnv *, jclass, jobject);
 
 /*
···
  * Method:    createMemoryFileDescriptor
  * Signature: (Ljava/lang/String;)I
  */
-JNIEXPORT jint JNICALL Java_org_thoughtcrime_securesms_util_FileUtils_createMemoryFileDescriptor
+//**TM_SA**//Change the package name to be our name.
+JNIEXPORT jint JNICALL Java_org_tm_archive_util_FileUtils_createMemoryFileDescriptor
   (JNIEnv *, jclass, jstring);
 
 #ifdef __cplusplus

app/src/main/java/org/tm/archive/ApplicationContext.java

···
  */
 package org.tm.archive;
 
+import android.app.Application;
 import android.content.Context;
 
 import androidx.annotation.NonNull;
···
 import androidx.multidex.MultiDexApplication;
 
 import com.google.android.gms.security.ProviderInstaller;
+import com.google.firebase.FirebaseApp;
+import com.tm.androidcopysdk.AndroidCopySDK;
+import com.tm.androidcopysdk.AndroidCopySettings;
+import com.tm.androidcopysdk.BackupService;
+import com.tm.androidcopysdk.CommonUtils;
+import com.tm.androidcopysdk.utils.PrefManager;
+import com.tm.authenticatorsdk.selfAuthenticator.AuthenticatorConstants;
 
+import org.archiver.ArchiveConstants;
+import org.archiver.ArchiveLogger;
+import org.archiver.FCMConnector;
 import org.conscrypt.ConscryptSignal;
 import org.greenrobot.eventbus.EventBus;
 import org.signal.aesgcmprovider.AesGcmProvider;
···
 import io.reactivex.rxjava3.exceptions.UndeliverableException;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.schedulers.Schedulers;
+import kotlin.Pair;
 import kotlin.Unit;
 import rxdogtag2.RxDogTag;
+
+import static org.archiver.ArchiveConstants.isTestMode;
 
 /**
  * Will be called once when the TextSecure process is created.
···
 
   private static final String TAG = Log.tag(ApplicationContext.class);
 
+  private static Application mApplicationContext;//**TM_SA**//
+
   public static ApplicationContext getInstance(Context context) {
     return (ApplicationContext)context.getApplicationContext();
+  }
+
+  public static Application getInstance() {//**TM_SA**//
+    return mApplicationContext;
   }
 
   @Override
···
     Log.d(TAG, "onCreate() took " + (System.currentTimeMillis() - startTime) + " ms");
     SignalLocalMetrics.ColdStart.onApplicationCreateFinished();
     Tracer.getInstance().end("Application#onCreate()");
+
+    //**TM_SA**// start
+    com.tm.logger.Log.i(TAG, "1 current FCM: " + FirebaseApp.getInstance().getOptions().getProjectId());
+    mApplicationContext = this;
+
+    com.tm.logger.Log.createInstance(getApplicationContext());
+    ArchiveLogger.Companion.sendArchiveLog("TeleMessage logger created");
+
+    initArchiveUrlsAndStartArchive();
   }
 
+  private void initArchiveUrlsAndStartArchive() {
+
+    if(CommonUtils.isMyServiceRunning(mApplicationContext, BackupService.class)){
+      CommonUtils.stopBackupService(mApplicationContext, false);
+    }
+
+    ArchiveLogger.Companion.sendArchiveLog("initializeTMAndroidArchive \nsetUrl: \nchosenUrl =" + ArchiveConstants.charlieProduction + "\nKeeperUrl =" + ArchiveConstants.prodKeeper);
+    if(org.tm.archive.BuildConfig.DEBUG){
+      String baseUrlPrefProd = PrefManager.getStringPref(mApplicationContext, ArchiveConstants.SHARED_PREFERENCE_SELECTED_BASE_URL_PRODUCTION_KEY, ArchiveConstants.charlieProduction);
+      String baseUrlPrefKeeper = PrefManager.getStringPref(mApplicationContext, ArchiveConstants.SHARED_PREFERENCE_SELECTED_BASE_URL_KEEPER_KEY,ArchiveConstants.prodKeeper);
+      AuthenticatorConstants.Companion.setBASE_URL(new Pair(baseUrlPrefProd, baseUrlPrefKeeper));
+      CommonUtils.setUrl(mApplicationContext, baseUrlPrefProd, baseUrlPrefKeeper);
+    }else {
+      CommonUtils.setUrl(mApplicationContext, ArchiveConstants.charlieProduction, ArchiveConstants.prodKeeper);
+    }
+    CommonUtils.setSqlInfo(getApplicationContext(), ArchiveConstants.isTestMode ? ArchiveConstants.signalTestPassword : ArchiveConstants.signalCurrentPassword);
+
+    //set SDK to active -> need to change it with the self register
+    boolean installationEventSent = PrefManager.getBooleanPref(getApplicationContext(), R.string.installation_event_sent, false);
+    PrefManager.setBooleanPref(getApplicationContext(), "activated_aa" ,true);
+
+    if(isTestMode || !installationEventSent) {
+      initializeTMAndroidArchive();
+      ArchiveLogger.Companion.sendArchiveLog("initializeTMAndroidArchive");
+    }
+
+    CommonUtils.startBackupService(getApplicationContext());
+    ArchiveLogger.Companion.sendArchiveLog("Backup service started");
+  }
+
+  private void initializeTMAndroidArchive() {
+
+    AndroidCopySettings mSettings = new AndroidCopySettings();
+
+    PrefManager.setStringPref(getApplicationContext(),"wifi3g","WIFI3G");
+
+    mSettings.setData(AndroidCopySettings.DataSaving.WIFI3G);
+    com.tm.logger.Log.d("initializeTMAndroidArchive", "signupSucess with emptey password and user name");
+    AndroidCopySDK.getInstance(getApplicationContext()).signupSucess(/*ArchiveConstants.signalTestUserName, ArchiveConstants.signalTestPassword*/ "", "");
+
+    ArchiveLogger.Companion.sendArchiveLog("User name = " + "Password = ");
+
+    boolean installationEventSent = PrefManager.getBooleanPref(getApplicationContext(), R.string.installation_event_sent, false);
+    // InstallEvent should be sent only once
+    if(!installationEventSent) {
+      PrefManager.setBooleanPref(getApplicationContext(),R.string.installation_event_sent,true);
+    }
+  }
+  //**TM_SA**// End
+
   @Override
   public void onForeground() {
     long startTime = System.currentTimeMillis();
···
       long nextSetTime = SignalStore.account().getFcmTokenLastSetTime() + TimeUnit.HOURS.toMillis(6);
 
       if (SignalStore.account().getFcmToken() == null || nextSetTime <= System.currentTimeMillis()) {
-        ApplicationDependencies.getJobManager().add(new FcmRefreshJob());
+        FCMConnector.initOfficialSignalFirebaseAccount(this);//**TM_SA**//
+//        ApplicationDependencies.getJobManager().add(new FcmRefreshJob());//**TM_SA**//
       }
     }
   }

app/src/main/java/org/tm/archive/DeviceProvisioningActivity.java

···
         .setOnDismissListener(dialog13 -> finish())
         .create();
 
-    dialog.setIcon(getResources().getDrawable(R.drawable.icon_dialog));
+    dialog.setIcon(getResources().getDrawable(R.drawable.ic_launcher_foreground_new));//**TM_SA**//
     dialog.show();
   }
 }

app/src/main/java/org/tm/archive/MainActivity.java

···
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
 import android.view.View;
 import android.view.ViewTreeObserver;
 
···
 import androidx.lifecycle.ViewModelProvider;
 
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import com.tm.androidcopysdk.utils.PrefManager;
 
+import org.archiver.ArchivePreferenceConstants;
 import org.signal.core.util.concurrent.LifecycleDisposable;
 import org.signal.core.util.logging.Log;
 import org.signal.donations.StripeApi;
···
 import org.tm.archive.components.voice.VoiceNoteMediaController;
 import org.tm.archive.components.voice.VoiceNoteMediaControllerOwner;
 import org.tm.archive.conversationlist.RelinkDevicesReminderBottomSheetFragment;
+import org.tm.archive.dependencies.ApplicationDependencies;
 import org.tm.archive.devicetransfer.olddevice.OldDeviceExitActivity;
 import org.tm.archive.keyvalue.SignalStore;
 import org.tm.archive.net.DeviceTransferBlockingInterceptor;
···
     updateTabVisibility();
 
     vitalsViewModel.checkSlowNotificationHeuristics();
+    //**TM_SA**// start
+    notifyMessageIfNeeded();
   }
+
+  private void notifyMessageIfNeeded() {
+    boolean isAlreadyRestarted = PrefManager.getBooleanPref(this, ArchivePreferenceConstants.PREF_KEY_MAIN_ACTIVITY_RESTART, false);
+
+    if(!isAlreadyRestarted){
+      PrefManager.setBooleanPref(this, ArchivePreferenceConstants.PREF_KEY_MAIN_ACTIVITY_RESTART, true);
+
+      final Handler handler = new Handler(Looper.getMainLooper());
+      handler.postDelayed(new Runnable() {
+        @Override
+        public void run() {
+          notifyMessage();
+        }
+      }, 4000);
+    }
+  }
+
+  public synchronized void notifyMessage(){
+    synchronized (ApplicationDependencies.getIncomingMessageObserver()) {
+      ApplicationDependencies.getIncomingMessageObserver().notifyAll();
+    }
+  }
+
+  //**TM_SA**// End
 
   @Override
   protected void onStop() {

app/src/main/java/org/tm/archive/audio/AudioWaveFormGenerator.java

···
         throw new IOException("Mime not audio");
       }
 
+      //**TM_SA**//S
+      if(mime.equals("audio/ac3")){
+        throw new IOException("Ac3 Audio type not supported");
+      }
+      //**TM_SA**//E
+
       MediaCodec codec = MediaCodec.createDecoderByType(mime);
 
       if (totalDurationUs == 0) {

app/src/main/java/org/tm/archive/backup/FullBackupImporter.java

···
   }
 
   private static void processVersion(@NonNull SQLiteDatabase db, DatabaseVersion version) throws IOException {
-    if (version.version == null || version.version > db.getVersion()) {
+    //**TM_SA**//s
+    /*if (version.version == null || version.version > db.getVersion()) {
       throw new DatabaseDowngradeException(db.getVersion(), version.version != null ? version.version : -1);
-    }
+    }*/
+    //**TM_SA**//s
 
     db.setVersion(version.version);
   }

app/src/main/java/org/tm/archive/components/reminder/OutdatedBuildReminder.java

···
     return false;
   }
 
+  //**TM_SA**// start
   public static boolean isEligible() {
-    return getDaysUntilExpiry() <= 10;
+    return false;//getDaysUntilExpiry() <= 10;
   }
+  //**TM_SA**// End
 
   private static int getDaysUntilExpiry() {
     return (int) TimeUnit.MILLISECONDS.toDays(Util.getTimeUntilBuildExpiry());

app/src/main/java/org/tm/archive/components/settings/app/AppSettingsFragment.kt

···
 package org.tm.archive.components.settings.app
 
+import android.app.AlertDialog
+import android.app.Dialog
 import android.os.Bundle
 import android.view.View
 import android.widget.TextView
···
 import androidx.annotation.IdRes
 import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
+import com.tm.androidcopysdk.AndroidCopySDK
+import com.tm.androidcopysdk.ISendLogCallback
+import com.tm.androidcopysdk.utils.PrefManager
+import org.archiver.ArchivePreferenceConstants
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
+import org.selfAuthentication.ProgressDialog
 import org.tm.archive.R
 import org.tm.archive.badges.BadgeImageView
 import org.tm.archive.components.AvatarImageView
···
 class AppSettingsFragment : DSLSettingsFragment(
   titleId = R.string.text_secure_normal__menu_settings,
   layoutId = R.layout.dsl_settings_fragment_with_reminder
-) {
+)  ,
+  ISendLogCallback { //**TM_SA**// add ISendLogCallback{
 
   private val viewModel: AppSettingsViewModel by viewModels()
 
   private lateinit var reminderView: Stub<ReminderView>
+
+  lateinit var mProgressDialog : Dialog //**TM_SA**//
 
   override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
     viewLifecycleOwner.lifecycle.addObserver(TerminalDonationDelegate(childFragmentManager, viewLifecycleOwner))
···
         isEnabled = state.isDeprecatedOrUnregistered()
       )
 
-      if (state.allowUserToGoToDonationManagementScreen) {
-        clickPref(
+      //**TM_SA**// Start - Comment all the Signal mention and put our about and sending logs logic.
+      if (false/*state.allowUserToGoToDonationManagementScreen*/) {
+        /*clickPref(
           title = DSLSettingsText.from(R.string.preferences__donate_to_signal),
           icon = DSLSettingsIcon.from(R.drawable.symbol_heart_24),
           iconEnd = if (state.hasExpiredGiftBadge) DSLSettingsIcon.from(R.drawable.symbol_info_fill_24, R.color.signal_accent_primary) else null,
···
             findNavController().safeNavigate(AppSettingsFragmentDirections.actionAppSettingsFragmentToManageDonationsFragment())
           },
           onLongClick = this@AppSettingsFragment::copySubscriberIdToClipboard
-        )
+        )*/
       } else {
-        externalLinkPref(
+        /*externalLinkPref(
           title = DSLSettingsText.from(R.string.preferences__donate_to_signal),
           icon = DSLSettingsIcon.from(R.drawable.symbol_heart_24),
           linkId = R.string.donate_url
         )
-      }
+      }*/
 
-      dividerPref()
+        clickPref(
+          title = DSLSettingsText.from(R.string.preferences__send_logs_to_telemessage),
+          icon = DSLSettingsIcon.from(R.drawable.ic_settings_logs_icon),
+          onClick = {
+            doSendLogsClicked()
+          })
 
-      clickPref(
-        title = DSLSettingsText.from(R.string.preferences__appearance),
-        icon = DSLSettingsIcon.from(R.drawable.symbol_appearance_24),
-        onClick = {
-          findNavController().safeNavigate(R.id.action_appSettingsFragment_to_appearanceSettingsFragment)
-        }
-      )
+        clickPref(
+          title = DSLSettingsText.from(R.string.EditAboutFragment_about),
+          icon = DSLSettingsIcon.from(R.drawable.ic_about_icon),
+          onClick = {
+            findNavController().safeNavigate(R.id.action_appSettingsFragment_to_tmAboutSettings)
+          }
+        )
 
-      clickPref(
-        title = DSLSettingsText.from(R.string.preferences_chats__chats),
-        icon = DSLSettingsIcon.from(R.drawable.symbol_chat_24),
-        onClick = {
-          findNavController().safeNavigate(R.id.action_appSettingsFragment_to_chatsSettingsFragment)
-        },
-        isEnabled = state.isDeprecatedOrUnregistered()
-      )
+        //**TM_SA**// End
 
-      clickPref(
-        title = DSLSettingsText.from(R.string.preferences__stories),
-        icon = DSLSettingsIcon.from(R.drawable.symbol_stories_24),
-        onClick = {
-          findNavController().safeNavigate(AppSettingsFragmentDirections.actionAppSettingsFragmentToStoryPrivacySettings(R.string.preferences__stories))
-        },
-        isEnabled = state.isDeprecatedOrUnregistered()
-      )
+        dividerPref()
 
-      clickPref(
-        title = DSLSettingsText.from(R.string.preferences__notifications),
-        icon = DSLSettingsIcon.from(R.drawable.symbol_bell_24),
-        onClick = {
-          findNavController().safeNavigate(R.id.action_appSettingsFragment_to_notificationsSettingsFragment)
-        },
-        isEnabled = state.isDeprecatedOrUnregistered()
-      )
+        clickPref(
+          title = DSLSettingsText.from(R.string.preferences__appearance),
+          icon = DSLSettingsIcon.from(R.drawable.symbol_appearance_24),
+          onClick = {
+            findNavController().safeNavigate(R.id.action_appSettingsFragment_to_appearanceSettingsFragment)
+          }
+        )
 
-      clickPref(
-        title = DSLSettingsText.from(R.string.preferences__privacy),
-        icon = DSLSettingsIcon.from(R.drawable.symbol_lock_24),
-        onClick = {
-          findNavController().safeNavigate(R.id.action_appSettingsFragment_to_privacySettingsFragment)
-        },
-        isEnabled = state.isDeprecatedOrUnregistered()
-      )
+        clickPref(
+          title = DSLSettingsText.from(R.string.preferences_chats__chats),
+          icon = DSLSettingsIcon.from(R.drawable.symbol_chat_24),
+          onClick = {
+            findNavController().safeNavigate(R.id.action_appSettingsFragment_to_chatsSettingsFragment)
+          },
+          isEnabled = state.isDeprecatedOrUnregistered()
+        )
 
-      clickPref(
-        title = DSLSettingsText.from(R.string.preferences__data_and_storage),
-        icon = DSLSettingsIcon.from(R.drawable.symbol_data_24),
-        onClick = {
-          findNavController().safeNavigate(R.id.action_appSettingsFragment_to_dataAndStorageSettingsFragment)
-        }
-      )
+        clickPref(
+          title = DSLSettingsText.from(R.string.preferences__stories),
+          icon = DSLSettingsIcon.from(R.drawable.symbol_stories_24),
+          onClick = {
+            findNavController().safeNavigate(AppSettingsFragmentDirections.actionAppSettingsFragmentToStoryPrivacySettings(R.string.preferences__stories))
+          },
+          isEnabled = state.isDeprecatedOrUnregistered()
+        )
 
-      if (Environment.IS_NIGHTLY) {
         clickPref(
-          title = DSLSettingsText.from("App updates"),
-          icon = DSLSettingsIcon.from(R.drawable.symbol_calendar_24),
+          title = DSLSettingsText.from(R.string.preferences__notifications),
+          icon = DSLSettingsIcon.from(R.drawable.symbol_bell_24),
           onClick = {
-            findNavController().safeNavigate(R.id.action_appSettingsFragment_to_appUpdatesSettingsFragment)
+            findNavController().safeNavigate(R.id.action_appSettingsFragment_to_notificationsSettingsFragment)
+          },
+          isEnabled = state.isDeprecatedOrUnregistered()
+        )
+
+        clickPref(
+          title = DSLSettingsText.from(R.string.preferences__privacy),
+          icon = DSLSettingsIcon.from(R.drawable.symbol_lock_24),
+          onClick = {
+            findNavController().safeNavigate(R.id.action_appSettingsFragment_to_privacySettingsFragment)
+          },
+          isEnabled = state.isDeprecatedOrUnregistered()
+        )
+
+        clickPref(
+          title = DSLSettingsText.from(R.string.preferences__data_and_storage),
+          icon = DSLSettingsIcon.from(R.drawable.symbol_data_24),
+          onClick = {
+            findNavController().safeNavigate(R.id.action_appSettingsFragment_to_dataAndStorageSettingsFragment)
           }
         )
-      }
+
+        if (Environment.IS_NIGHTLY) {
+          clickPref(
+            title = DSLSettingsText.from("App updates"),
+            icon = DSLSettingsIcon.from(R.drawable.symbol_calendar_24),
+            onClick = {
+              findNavController().safeNavigate(R.id.action_appSettingsFragment_to_appUpdatesSettingsFragment)
+            }
+          )
+        }
 
-      dividerPref()
+        dividerPref()
 
-      if (SignalStore.paymentsValues().paymentsAvailability.showPaymentsMenu()) {
+        //**TM_SA**// Mark this part
+        /*if (SignalStore.paymentsValues().paymentsAvailability.showPaymentsMenu()) {
         customPref(
           PaymentsPreference(
             unreadCount = state.unreadPaymentsCount
···
         onClick = {
           findNavController().safeNavigate(R.id.action_appSettingsFragment_to_helpSettingsFragment)
         }
-      )
-
-      clickPref(
-        title = DSLSettingsText.from(R.string.AppSettingsFragment__invite_your_friends),
-        icon = DSLSettingsIcon.from(R.drawable.symbol_invite_24),
-        onClick = {
-          findNavController().safeNavigate(R.id.action_appSettingsFragment_to_inviteActivity)
-        }
-      )
-
-      if (FeatureFlags.internalUser()) {
-        dividerPref()
+      )*/
+//**TM_SA**//end
 
         clickPref(
-          title = DSLSettingsText.from(R.string.preferences__internal_preferences),
+          title = DSLSettingsText.from(R.string.AppSettingsFragment__invite_your_friends),
+          icon = DSLSettingsIcon.from(R.drawable.symbol_invite_24),
           onClick = {
-            findNavController().safeNavigate(R.id.action_appSettingsFragment_to_internalSettingsFragment)
+            findNavController().safeNavigate(R.id.action_appSettingsFragment_to_inviteActivity)
           }
         )
+
+        if (FeatureFlags.internalUser()) {
+          dividerPref()
+
+          clickPref(
+            title = DSLSettingsText.from(R.string.preferences__internal_preferences),
+            onClick = {
+              findNavController().safeNavigate(R.id.action_appSettingsFragment_to_internalSettingsFragment)
+            }
+          )
+        }
       }
     }
+
   }
+
+  //**TM_SA**// start
+
+
+  override fun sendLogSucceed() {
+    mProgressDialog.hide()
+    com.tm.logger.Log.d("sendLog", "sendLogSucceed")
+  }
+
+  override fun sendLogFailure() {
+    mProgressDialog.hide()
+    com.tm.logger.Log.d("sendLog", "sendLogFailure")
+  }
+
+
+  private fun doSendLogsClicked() {
+
+    val builder = AlertDialog.Builder(context)
+
+    mProgressDialog = ProgressDialog.progressDialog(requireContext())
+
+    builder.setTitle(R.string.issue_report_list_title)
+    builder.setMessage(getString(R.string.issue_report_list_summery) + "?")
+
+    builder.setPositiveButton(R.string.ShareActivity__send) { dialog, which ->
+
+      mProgressDialog.show()
+
+      AndroidCopySDK.getInstance(context).sentLogs(
+        activity,
+        this,
+        PrefManager.getStringPref(context, ArchivePreferenceConstants.PREF_KEY_DEVICE_PHONE_NUMBER, ""),
+        "Signal Archiver logs",
+        PrefManager.getStringPref(context, ArchivePreferenceConstants.PREF_KEY_DEVICE_NAME, ""),
+        "",
+        "",
+        "",
+        "",
+        ArchivePreferenceConstants.GENERATE_TOK_NAME,
+        ArchivePreferenceConstants.GENERATE_TOK_PASS
+      )
+    }
+    builder.setNegativeButton(R.string.CommunicationActions_cancel, null)
+    builder.show()
+
+  }
+
+  //**TM_SA**// End
 
   private fun copySubscriberIdToClipboard(): Boolean {
     val subscriber = SignalStore.donationsValues().getSubscriber()

app/src/main/java/org/tm/archive/components/settings/app/help/HelpSettingsFragment.kt

···
         summary = DSLSettingsText.from(BuildConfig.VERSION_NAME)
       )
 
-      clickPref(
+      //**TM_SA**//s
+      /*clickPref(
         title = DSLSettingsText.from(R.string.HelpSettingsFragment__debug_log),
         onClick = {
           Navigation.findNavController(requireView()).safeNavigate(R.id.action_helpSettingsFragment_to_submitDebugLogActivity)
         }
-      )
+      )*/
+      //**TM_SA**//e
 
       clickPref(
         title = DSLSettingsText.from(R.string.HelpSettingsFragment__licenses),

app/src/main/java/org/tm/archive/components/settings/app/privacy/PrivacySettingsFragment.kt

···
 
       dividerPref()
 
-      sectionHeaderPref(R.string.preferences_app_protection__payments)
+      /*sectionHeaderPref(R.string.preferences_app_protection__payments)
 
       switchPref(
         title = DSLSettingsText.from(R.string.preferences__payment_lock),
···
             viewModel.togglePaymentLock(true)
           }
         }
-      )
+      )*/
 
       dividerPref()