6543/BayernMessenger
1
0
Fork 0
forked from GitHub-Mirror/riotX-android
Code Issues 4 Pull Requests Releases Wiki Activity

Make build FDroid pass

Browse Source
This commit is contained in:
Benoit Marty
2019-04-04 11:09:58 +02:00
parent 08dacacdda
commit 772670252a
22 changed files with 34 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vector/src/fdroid/AndroidManifest.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="im.vector">
package="im.vector.riotredesign">
<application>

2
vector/src/fdroid/java/im/vector/push/fcm/FcmHelper.java → vector/src/fdroid/java/im/vector/riotredesign/push/fcm/FcmHelper.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package im.vector.push.fcm;
package im.vector.riotredesign.push.fcm;
import android.app.Activity;
import android.content.Context;

8
vector/src/fdroid/java/im/vector/push/fcm/NotificationTroubleshootTestManagerFactory.kt → vector/src/fdroid/java/im/vector/riotredesign/push/fcm/NotificationTroubleshootTestManagerFactory.kt
View File

@ -13,17 +13,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package im.vector.push.fcm
package im.vector.riotredesign.push.fcm
import androidx.fragment.app.Fragment
import im.vector.fragments.troubleshoot.TestAccountSettings
import im.vector.fragments.troubleshoot.TestDeviceSettings
import im.vector.matrix.android.api.session.Session
import im.vector.push.fcm.troubleshoot.TestAutoStartBoot
import im.vector.push.fcm.troubleshoot.TestBackgroundRestrictions
import im.vector.riotredesign.features.settings.troubleshoot.NotificationTroubleshootTestManager
import im.vector.riotredesign.features.settings.troubleshoot.TestBingRulesSettings
import im.vector.riotredesign.features.settings.troubleshoot.TestDeviceSettings
import im.vector.riotredesign.features.settings.troubleshoot.TestSystemSettings
import im.vector.riotredesign.push.fcm.troubleshoot.TestAutoStartBoot
import im.vector.riotredesign.push.fcm.troubleshoot.TestBackgroundRestrictions
class NotificationTroubleshootTestManagerFactory {

2
vector/src/fdroid/java/im/vector/push/fcm/troubleshoot/TestAutoStartBoot.kt → vector/src/fdroid/java/im/vector/riotredesign/push/fcm/troubleshoot/TestAutoStartBoot.kt
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package im.vector.push.fcm.troubleshoot
package im.vector.riotredesign.push.fcm.troubleshoot
import androidx.fragment.app.Fragment
import im.vector.riotredesign.R

2
vector/src/fdroid/java/im/vector/push/fcm/troubleshoot/TestBackgroundRestrictions.kt → vector/src/fdroid/java/im/vector/riotredesign/push/fcm/troubleshoot/TestBackgroundRestrictions.kt
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package im.vector.push.fcm.troubleshoot
package im.vector.riotredesign.push.fcm.troubleshoot
import android.content.Context
import android.net.ConnectivityManager

2
vector/src/fdroid/java/im/vector/push/fcm/troubleshoot/TestBatteryOptimization.kt → vector/src/fdroid/java/im/vector/riotredesign/push/fcm/troubleshoot/TestBatteryOptimization.kt
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package im.vector.push.fcm.troubleshoot
package im.vector.riotredesign.push.fcm.troubleshoot
import androidx.fragment.app.Fragment
import im.vector.riotredesign.R

2
vector/src/fdroid/java/im/vector/receiver/OnApplicationUpgradeReceiver.java → vector/src/fdroid/java/im/vector/riotredesign/receiver/OnApplicationUpgradeReceiver.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package im.vector.receiver;
package im.vector.riotredesign.receiver;
import android.content.BroadcastReceiver;
import android.content.Context;

5
vector/src/gplay/AndroidManifest.xml
View File

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="im.vector.riotredesign">
<application>
@ -8,7 +9,7 @@
android:name="firebase_analytics_collection_deactivated"
android:value="true" />
<service android:name="im.vector.push.fcm.VectorFirebaseMessagingService">
<service android:name=".push.fcm.VectorFirebaseMessagingService">
<intent-filter>
<action android:name="com.google.firebase.MESSAGING_EVENT" />
</intent-filter>

2
vector/src/gplay/java/im/vector/push/fcm/FcmHelper.java → vector/src/gplay/java/im/vector/riotredesign/push/fcm/FcmHelper.java
View File

@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package im.vector.push.fcm;
package im.vector.riotredesign.push.fcm;
import android.app.Activity;
import android.content.Context;

8
vector/src/gplay/java/im/vector/push/fcm/NotificationTroubleshootTestManagerFactory.kt → vector/src/gplay/java/im/vector/riotredesign/push/fcm/NotificationTroubleshootTestManagerFactory.kt
View File

@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package im.vector.push.fcm
package im.vector.riotredesign.push.fcm
import androidx.fragment.app.Fragment
import im.vector.fragments.troubleshoot.TestAccountSettings
import im.vector.matrix.android.api.session.Session
import im.vector.push.fcm.troubleshoot.TestFirebaseToken
import im.vector.push.fcm.troubleshoot.TestPlayServices
import im.vector.push.fcm.troubleshoot.TestTokenRegistration
import im.vector.riotredesign.push.fcm.troubleshoot.TestFirebaseToken
import im.vector.riotredesign.push.fcm.troubleshoot.TestPlayServices
import im.vector.riotredesign.push.fcm.troubleshoot.TestTokenRegistration
import im.vector.riotredesign.features.settings.troubleshoot.NotificationTroubleshootTestManager
import im.vector.riotredesign.features.settings.troubleshoot.TestBingRulesSettings
import im.vector.riotredesign.features.settings.troubleshoot.TestDeviceSettings

2
vector/src/gplay/java/im/vector/push/fcm/VectorFirebaseMessagingService.kt → vector/src/gplay/java/im/vector/riotredesign/push/fcm/VectorFirebaseMessagingService.kt
View File

@ -17,7 +17,7 @@
* limitations under the License.
*/
package im.vector.push.fcm
package im.vector.riotredesign.push.fcm
import android.os.Handler
import android.os.Looper

2
vector/src/gplay/java/im/vector/push/fcm/troubleshoot/TestFirebaseToken.kt → vector/src/gplay/java/im/vector/riotredesign/push/fcm/troubleshoot/TestFirebaseToken.kt
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package im.vector.push.fcm.troubleshoot
package im.vector.riotredesign.push.fcm.troubleshoot
import androidx.fragment.app.Fragment
import com.google.firebase.iid.FirebaseInstanceId

2
vector/src/gplay/java/im/vector/push/fcm/troubleshoot/TestPlayServices.kt → vector/src/gplay/java/im/vector/riotredesign/push/fcm/troubleshoot/TestPlayServices.kt
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package im.vector.push.fcm.troubleshoot
package im.vector.riotredesign.push.fcm.troubleshoot
import androidx.fragment.app.Fragment
import com.google.android.gms.common.ConnectionResult

2
vector/src/gplay/java/im/vector/push/fcm/troubleshoot/TestTokenRegistration.kt → vector/src/gplay/java/im/vector/riotredesign/push/fcm/troubleshoot/TestTokenRegistration.kt
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package im.vector.push.fcm.troubleshoot
package im.vector.riotredesign.push.fcm.troubleshoot
import androidx.fragment.app.Fragment
import im.vector.riotredesign.R

3
vector/src/main/java/im/vector/riotredesign/core/services/EventStreamServiceX.kt
View File

@ -122,8 +122,7 @@ class EventStreamServiceX : VectorService() {
}
}
}
}
*/
} */
/**
* Service internal state

3
vector/src/main/java/im/vector/riotredesign/features/notifications/NotifiableEventResolver.kt
View File

@ -182,7 +182,6 @@ class NotifiableEventResolver(val context: Context) {
//TODO generic handling?
}
return null
}
*/
} */
}

3
vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsAdvancedNotificationPreferenceFragment.kt
View File

@ -49,8 +49,7 @@ class VectorSettingsAdvancedNotificationPreferenceFragment : VectorPreferenceFra
refreshPreferences()
refreshDisplay()
}
}
*/
} */
override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
// define the layout

2
vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt
View File

@ -29,7 +29,7 @@ import androidx.recyclerview.widget.RecyclerView
import androidx.transition.TransitionManager
import butterknife.BindView
import im.vector.matrix.android.api.session.Session
import im.vector.push.fcm.NotificationTroubleshootTestManagerFactory
import im.vector.riotredesign.push.fcm.NotificationTroubleshootTestManagerFactory
import im.vector.riotredesign.R
import im.vector.riotredesign.core.extensions.withArgs
import im.vector.riotredesign.core.platform.RiotActivity

6
vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsPreferencesFragment.kt
View File

@ -1867,8 +1867,7 @@ class VectorSettingsPreferencesFragment : VectorPreferenceFragment(), SharedPref
}
.show()
}
}
*/
} */
//==============================================================================================================
// Phone number management
@ -1950,8 +1949,7 @@ class VectorSettingsPreferencesFragment : VectorPreferenceFragment(), SharedPref
}
addPhoneBtn.order = order
}
*/
} */
}
//==============================================================================================================