<table><tr><td style="">jjazeix created this revision.<br />jjazeix added a reviewer: timotheegiet.<br />jjazeix added a project: GCompris: Improvements.<br />Herald added a project: KDE Edu.<br />Herald added a subscriber: kde-edu.<br />jjazeix requested review of this revision.

</td><a style="text-decoration: none; padding: 4px 8px; margin: 0 8px 8px; float: right; color: #464C5C; font-weight: bold; border-radius: 3px; background-color: #F7F7F9; background-image: linear-gradient(to bottom,#fff,#f1f0f1); display: inline-block; border: 1px solid rgba(71,87,120,.2);" href="https://phabricator.kde.org/D28771">View Revision</a></tr></table><br /><div><strong>REVISION SUMMARY</strong><div><p>Clean up all code related to demo and activation code</p></div></div><br /><div><strong>TEST PLAN</strong><div><p>Linux + Android</p></div></div><br /><div><strong>REPOSITORY</strong><div><div>R2 GCompris</div></div></div><br /><div><strong>REVISION DETAIL</strong><div><a href="https://phabricator.kde.org/D28771">https://phabricator.kde.org/D28771</a></div></div><br /><div><strong>AFFECTED FILES</strong><div><div>CMakeLists.txt<br />

android/CMakeLists.txt<br />

android/src/com/android/vending/billing/IInAppBillingService.aidl<br />

android/src/net/gcompris/GComprisActivity.java<br />

appveyor.yml<br />

platforms/ios/config.h<br />

platforms/macosx/config.h<br />

src/activities/CMakeLists.txt<br />

src/activities/advanced_colors/ActivityInfo.qml<br />

src/activities/algebra_by/ActivityInfo.qml<br />

src/activities/algebra_div/ActivityInfo.qml<br />

src/activities/algebra_minus/ActivityInfo.qml<br />

src/activities/algebra_plus/ActivityInfo.qml<br />

src/activities/algorithm/ActivityInfo.qml<br />

src/activities/align4-2players/ActivityInfo.qml<br />

src/activities/align4/ActivityInfo.qml<br />

src/activities/alphabet-sequence/ActivityInfo.qml<br />

src/activities/baby_tangram/ActivityInfo.qml<br />

src/activities/baby_wordprocessor/ActivityInfo.qml<br />

src/activities/babymatch/ActivityInfo.qml<br />

src/activities/babyshapes/ActivityInfo.qml<br />

src/activities/balancebox/ActivityInfo.qml<br />

src/activities/ballcatch/ActivityInfo.qml<br />

src/activities/bargame/ActivityInfo.qml<br />

src/activities/bargame_2players/ActivityInfo.qml<br />

src/activities/binary_bulb/ActivityInfo.qml<br />

src/activities/braille_alphabets/ActivityInfo.qml<br />

src/activities/braille_fun/ActivityInfo.qml<br />

src/activities/calendar/ActivityInfo.qml<br />

src/activities/canal_lock/ActivityInfo.qml<br />

src/activities/categorization/ActivityInfo.qml<br />

src/activities/checkers/ActivityInfo.qml<br />

src/activities/checkers_2players/ActivityInfo.qml<br />

src/activities/chess/ActivityInfo.qml<br />

src/activities/chess_2players/ActivityInfo.qml<br />

src/activities/chess_partyend/ActivityInfo.qml<br />

src/activities/chronos/ActivityInfo.qml<br />

src/activities/click_on_letter/ActivityInfo.qml<br />

src/activities/click_on_letter_up/ActivityInfo.qml<br />

src/activities/clickanddraw/ActivityInfo.qml<br />

src/activities/clickgame/ActivityInfo.qml<br />

src/activities/clockgame/ActivityInfo.qml<br />

src/activities/color_mix/ActivityInfo.qml<br />

src/activities/color_mix_light/ActivityInfo.qml<br />

src/activities/colors/ActivityInfo.qml<br />

src/activities/crane/ActivityInfo.qml<br />

src/activities/details/ActivityInfo.qml<br />

src/activities/digital_electricity/ActivityInfo.qml<br />

src/activities/drawletters/ActivityInfo.qml<br />

src/activities/drawnumbers/ActivityInfo.qml<br />

src/activities/enumerate/ActivityInfo.qml<br />

src/activities/erase/ActivityInfo.qml<br />

src/activities/erase_2clic/ActivityInfo.qml<br />

src/activities/erase_clic/ActivityInfo.qml<br />

src/activities/explore_farm_animals/ActivityInfo.qml<br />

src/activities/explore_monuments/ActivityInfo.qml<br />

src/activities/explore_world_animals/ActivityInfo.qml<br />

src/activities/explore_world_music/ActivityInfo.qml<br />

src/activities/family/ActivityInfo.qml<br />

src/activities/family_find_relative/ActivityInfo.qml<br />

src/activities/fifteen/ActivityInfo.qml<br />

src/activities/find_the_day/ActivityInfo.qml<br />

src/activities/followline/ActivityInfo.qml<br />

src/activities/football/ActivityInfo.qml<br />

src/activities/geo-country/ActivityInfo.qml<br />

src/activities/geography/ActivityInfo.qml<br />

src/activities/gletters/ActivityInfo.qml<br />

src/activities/gnumch-equality/ActivityInfo.qml<br />

src/activities/gnumch-factors/ActivityInfo.qml<br />

src/activities/gnumch-inequality/ActivityInfo.qml<br />

src/activities/gnumch-multiples/ActivityInfo.qml<br />

src/activities/gnumch-primes/ActivityInfo.qml<br />

src/activities/graph-coloring/ActivityInfo.qml<br />

src/activities/gravity/ActivityInfo.qml<br />

src/activities/guesscount/ActivityInfo.qml<br />

src/activities/guessnumber/ActivityInfo.qml<br />

src/activities/hangman/ActivityInfo.qml<br />

src/activities/hanoi/ActivityInfo.qml<br />

src/activities/hanoi_real/ActivityInfo.qml<br />

src/activities/hexagon/ActivityInfo.qml<br />

src/activities/imagename/ActivityInfo.qml<br />

src/activities/instruments/ActivityInfo.qml<br />

src/activities/land_safe/ActivityInfo.qml<br />

src/activities/lang/ActivityInfo.qml<br />

src/activities/leftright/ActivityInfo.qml<br />

src/activities/letter-in-word/ActivityInfo.qml<br />

src/activities/lightsoff/ActivityInfo.qml<br />

src/activities/louis-braille/ActivityInfo.qml<br />

src/activities/magic-hat-minus/ActivityInfo.qml<br />

src/activities/magic-hat-plus/ActivityInfo.qml<br />

src/activities/maze/ActivityInfo.qml<br />

src/activities/mazeinvisible/ActivityInfo.qml<br />

src/activities/mazerelative/ActivityInfo.qml<br />

src/activities/melody/ActivityInfo.qml<br />

src/activities/memory-case-association-tux/ActivityInfo.qml<br />

src/activities/memory-case-association/ActivityInfo.qml<br />

src/activities/memory-enumerate/ActivityInfo.qml<br />

src/activities/memory-math-add-minus-mult-div-tux/ActivityInfo.qml<br />

src/activities/memory-math-add-minus-mult-div/ActivityInfo.qml<br />

src/activities/memory-math-add-minus-tux/ActivityInfo.qml<br />

src/activities/memory-math-add-minus/ActivityInfo.qml<br />

src/activities/memory-math-add-tux/ActivityInfo.qml<br />

src/activities/memory-math-add/ActivityInfo.qml<br />

src/activities/memory-math-div-tux/ActivityInfo.qml<br />

src/activities/memory-math-div/ActivityInfo.qml<br />

src/activities/memory-math-minus-tux/ActivityInfo.qml<br />

src/activities/memory-math-minus/ActivityInfo.qml<br />

src/activities/memory-math-mult-div-tux/ActivityInfo.qml<br />

src/activities/memory-math-mult-div/ActivityInfo.qml<br />

src/activities/memory-math-mult-tux/ActivityInfo.qml<br />

src/activities/memory-math-mult/ActivityInfo.qml<br />

src/activities/memory-sound-tux/ActivityInfo.qml<br />

src/activities/memory-sound/ActivityInfo.qml<br />

src/activities/memory-tux/ActivityInfo.qml<br />

src/activities/memory-wordnumber/ActivityInfo.qml<br />

src/activities/memory/ActivityInfo.qml<br />

src/activities/menu/ConfigurationItem.qml<br />

src/activities/menu/Menu.qml<br />

src/activities/menu/resource/README<br />

src/activities/menu/resource/lock.svg<br />

src/activities/mining/ActivityInfo.qml<br />

src/activities/missing-letter/ActivityInfo.qml<br />

src/activities/money/ActivityInfo.qml<br />

src/activities/money_back/ActivityInfo.qml<br />

src/activities/money_back_cents/ActivityInfo.qml<br />

src/activities/money_cents/ActivityInfo.qml<br />

src/activities/mosaic/ActivityInfo.qml<br />

src/activities/nine_men_morris/ActivityInfo.qml<br />

src/activities/nine_men_morris_2players/ActivityInfo.qml<br />

src/activities/note_names/ActivityInfo.qml<br />

src/activities/number_sequence/ActivityInfo.qml<br />

src/activities/numbers-odd-even/ActivityInfo.qml<br />

src/activities/paintings/ActivityInfo.qml<br />

src/activities/penalty/ActivityInfo.qml<br />

src/activities/photo_hunter/ActivityInfo.qml<br />

src/activities/piano_composition/ActivityInfo.qml<br />

src/activities/planegame/ActivityInfo.qml<br />

src/activities/play_piano/ActivityInfo.qml<br />

src/activities/play_rhythm/ActivityInfo.qml<br />

src/activities/programmingMaze/ActivityInfo.qml<br />

src/activities/railroad/ActivityInfo.qml<br />

src/activities/readingh/ActivityInfo.qml<br />

src/activities/readingv/ActivityInfo.qml<br />

src/activities/redraw/ActivityInfo.qml<br />

src/activities/redraw_symmetrical/ActivityInfo.qml<br />

src/activities/renewable_energy/ActivityInfo.qml<br />

src/activities/reversecount/ActivityInfo.qml<br />

src/activities/roman_numerals/ActivityInfo.qml<br />

src/activities/scalesboard/ActivityInfo.qml<br />

src/activities/scalesboard_weight/ActivityInfo.qml<br />

src/activities/scalesboard_weight_avoirdupois/ActivityInfo.qml<br />

src/activities/share/ActivityInfo.qml<br />

src/activities/simplepaint/ActivityInfo.qml<br />

src/activities/smallnumbers/ActivityInfo.qml<br />

src/activities/smallnumbers2/ActivityInfo.qml<br />

src/activities/solar_system/ActivityInfo.qml<br />

src/activities/submarine/ActivityInfo.qml<br />

src/activities/sudoku/ActivityInfo.qml<br />

src/activities/superbrain/ActivityInfo.qml<br />

src/activities/tangram/ActivityInfo.qml<br />

src/activities/target/ActivityInfo.qml<br />

src/activities/template/ActivityInfo.qml<br />

src/activities/tic_tac_toe/ActivityInfo.qml<br />

src/activities/tic_tac_toe_2players/ActivityInfo.qml<br />

src/activities/traffic/ActivityInfo.qml<br />

src/activities/watercycle/ActivityInfo.qml<br />

src/activities/wordsgame/ActivityInfo.qml<br />

src/core/ActivityBase.qml<br />

src/core/ActivityInfo.cpp<br />

src/core/ActivityInfo.h<br />

src/core/ActivityInfoTree.cpp<br />

src/core/ActivityInfoTree.h<br />

src/core/ApplicationAndroid.cpp<br />

src/core/ApplicationSettings.cpp<br />

src/core/ApplicationSettings.h<br />

src/core/ApplicationSettingsDefault.cpp<br />

src/core/BuyMeOverlay.qml<br />

src/core/BuyMeOverlayInapp.qml<br />

src/core/CMakeLists.txt<br />

src/core/ChangeLog.qml<br />

src/core/config.h.in<br />

src/core/main.cpp<br />

tests/core/ActivityInfoTest.cpp<br />

tests/core/ApplicationSettingsTest.cpp<br />

tools/gencode.py</div></div></div><br /><div><strong>To: </strong>jjazeix, timotheegiet<br /><strong>Cc: </strong>kde-edu, sanjayshetty, parimalprasoon, harrymecwan, ganeshredcobra, asagtani, nityanandkumar, echarruau, andreask, rahulyadav, narvaez, scagarwal, apol, timotheegiet, jjazeix, bcoudoin<br /></div>