rebranding: rename sflphone to ring

Refs #69972
Refs #70084

Change-Id: I07540f8b4f23901c0e64b42639752dfb6eee9dd8

Makefile

@@ -8,7 +8,7 @@ SRC=ring-android
 LIBRINGJNI_H=ring/src/dring/dring.h
 LIBRINGJNI=$(SRC)/obj/local/$(ARCH)/libring.so
 
-JAVA_SOURCES=$(shell find $(SRC)/src/org/sflphone/ -type f -name "*.java")
+JAVA_SOURCES=$(shell find $(SRC)/src/cx/ring/ -type f -name "*.java")
 
 ifneq ($(V),)
 ANT_OPTS += -v
@@ -56,7 +56,7 @@ $(LIBRINGJNI): $(LIBRINGJNI_H)
 	@echo "=== Building libringjni ==="
 	@echo
 	$(VERBOSE)if [ -z "$(RING_SRC_DIR)" ] ; then RING_SRC_DIR=./ring; fi ; \
-	if [ -z "$(RING_CONTRIB)" ] ; then RING_CONTRIB="$$RING_SRC_DIR/daemon/contrib/$(TARGET_TUPLE)"; fi ; \
+	if [ -z "$(RING_CONTRIB)" ] ; then RING_CONTRIB="$$RING_SRC_DIR/contrib/$(TARGET_TUPLE)"; fi ; \
 	if [ `echo "$(RING_BUILD_DIR)" | head -c 1` != "/" ] ; then \
         RING_BUILD_DIR="../$(RING_BUILD_DIR)"; \
 	fi ; \
@@ -87,7 +87,7 @@ jniclean: lightclean
 distclean: clean jniclean
 
 install: $(RING_APK)
-	@echo "=== Installing SFLphone on device ==="
+	@echo "=== Installing Ring on device ==="
 	adb wait-for-device
 	adb install -r $(RING_APK)
 
@@ -96,7 +96,7 @@ uninstall:
 	adb uninstall cx.ring
 
 run:
-	@echo "=== Running SFLphone on device ==="
+	@echo "=== Running Ring on device ==="
 	adb wait-for-device
 	adb shell am start -n cx.ring/cx.ring.client.HomeActivity
 

ring-android/.idea/.name

-sflphone-android
+ring-android
\ No newline at end of file

ring-android/jni/JavaJNI2CJNI_Load.py

@@ -29,7 +29,7 @@ def type_to_signature(itype):
 		return "Ljava/lang/String;"
 	if itype == "Object":
 		return "Ljava/lang/Object;"
-	return "Lorg/sflphone/service/%s;" % itype
+	return "Lcx/ring/service/%s;" % itype
 
 def parse_java_file(input_stream, package, module):
 	outputs = []

ring-android/jni/ringservice.c.template

 #include "logger.h"
 
 JavaVM *gJavaVM;
-const char *ksflphoneservicePath = "cx/ring/service/RingserviceJNI";
+const char *kringservicePath = "cx/ring/service/RingserviceJNI";
 
 void deinitClassHelper(JNIEnv *env, jobject obj) {
-	SFL_INFO("deinitClassHelper");
+	RING_INFO("deinitClassHelper");
 
 	/* delete cached object instances */
     env->DeleteGlobalRef(obj);
-	SFL_INFO("deinitClassHelper: object %x deleted", obj);
+	RING_INFO("deinitClassHelper: object %x deleted", obj);
 }
 
 JNIEXPORT jint JNI_OnLoad(JavaVM *vm, void *reserved) {
@@ -16,7 +16,7 @@ JNIEXPORT jint JNI_OnLoad(JavaVM *vm, void *reserved) {
 	jclass clazz;
 	jint r;
 
-    SFL_INFO("JNI_OnLoad");
+    RING_INFO("JNI_OnLoad");
 
 	//Assume it is c++
 	r = vm->GetEnv ((void **) &env, JNI_VERSION_1_6);
@@ -24,14 +24,14 @@ JNIEXPORT jint JNI_OnLoad(JavaVM *vm, void *reserved) {
 		RING_ERR("JNI_OnLoad: failed to get the environment using GetEnv()");
         return -1;
     }
-	SFL_INFO("JNI_Onload: GetEnv %p", env);
+	RING_INFO("JNI_Onload: GetEnv %p", env);
 
-	clazz = env->FindClass (ksflphoneservicePath);
+	clazz = env->FindClass (kringservicePath);
 	if (!clazz) {
-        RING_ERR("JNI_Onload: whoops, %s class not found!", ksflphoneservicePath);
+        RING_ERR("JNI_Onload: whoops, %s class not found!", kringservicePath);
 	}
 	gJavaVM = vm;
-	SFL_INFO("JNI_Onload: JavaVM %p", gJavaVM);
+	RING_INFO("JNI_Onload: JavaVM %p", gJavaVM);
 
 	/* put instances of class object we need into cache */
     //initClassHelper(env, kManagerPath, &gManagerObject);
@@ -50,24 +50,24 @@ void JNI_OnUnLoad(JavaVM* vm, void* reserved) {
     JNIEnv* env;
 	jclass clazz;
 
-	SFL_INFO("JNI_OnUnLoad");
+	RING_INFO("JNI_OnUnLoad");
 
 	/* get env */
     if (vm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6) != JNI_OK) {
 		RING_ERR("JNI_OnUnLoad: failed to get the environment using GetEnv()");
         return;
     }
-	SFL_INFO("JNI_OnUnLoad: GetEnv %p", env);
+	RING_INFO("JNI_OnUnLoad: GetEnv %p", env);
 
     /* Get jclass with env->FindClass */
-	clazz = env->FindClass(ksflphoneservicePath);
+	clazz = env->FindClass(kringservicePath);
 	if (!clazz) {
-        RING_ERR("JNI_OnUnLoad: whoops, %s class not found!", ksflphoneservicePath);
+        RING_ERR("JNI_OnUnLoad: whoops, %s class not found!", kringservicePath);
 	}
 
 	/* remove instances of class object we need into cache */
     //deinitClassHelper(env, gManagerObject);
 
 	env->UnregisterNatives(clazz);
-	SFL_INFO("JNI_OnUnLoad: Native functions unregistered");
+	RING_INFO("JNI_OnUnLoad: Native functions unregistered");
 }

ring-android/make-swig.sh

@@ -96,7 +96,7 @@ python $SRCDIR/JavaJNI2CJNI_Load.py \
 -m Ringservice \
 -p $PACKAGE
 
-echo "Appending sflphone_wrapper.cpp..."
+echo "Appending ring_wrapper.cpp..."
 cat $SRCDIR/ringservice_loader.c >> $SRCDIR/ring_wrapper.cpp
 
 echo -n "in "